svn commit: samba r15072 - branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/nsswitch trunk/source/include trunk/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2006-04-13 12:03:12 +0000 (Thu, 13 Apr 2006)
New Revision: 15072

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15072

Log:
Last bit of 32/64 bit portabilities fixes for winbind 
clients and aservers.  Strange compiler-fu on 64-bit 
SLES9 says sizeof(time_t) == 4 but the memory alignment 
is on 8 bytes.  Change time_t to uint32 to fix alignment.
Remove 'char **gr_mem' from struct winbindd_gr since
it was not being used.


Modified:
   branches/SAMBA_3_0/source/include/includes.h
   branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h
   branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h
   trunk/source/include/includes.h
   trunk/source/nsswitch/winbind_nss_config.h
   trunk/source/nsswitch/winbindd_nss.h


Changeset:
Modified: branches/SAMBA_3_0/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0/source/include/includes.h	2006-04-13 12:03:05 UTC (rev 15071)
+++ branches/SAMBA_3_0/source/include/includes.h	2006-04-13 12:03:12 UTC (rev 15072)
@@ -21,6 +21,11 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+/* work around broken krb5.h on sles9 */
+#ifdef SIZEOF_LONG
+#undef SIZEOF_LONG
+#endif
+
 #ifndef NO_CONFIG_H /* for some tests */
 #include "config.h"
 #endif

Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h	2006-04-13 12:03:05 UTC (rev 15071)
+++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h	2006-04-13 12:03:12 UTC (rev 15072)
@@ -24,6 +24,12 @@
 #ifndef _WINBIND_NSS_CONFIG_H
 #define _WINBIND_NSS_CONFIG_H
 
+/* shutup the compiler warnings due to krb5.h on i
+   64-bit sles9 */
+#ifdef SIZEOF_LONG
+#undef SIZEOF_LONG
+#endif
+
 /* Include header files from data in config.h file */
 
 #ifndef NO_CONFIG_H

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h	2006-04-13 12:03:05 UTC (rev 15071)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h	2006-04-13 12:03:12 UTC (rev 15072)
@@ -157,7 +157,6 @@
 	gid_t gr_gid;
 	uint32 num_gr_mem;
 	uint32 gr_mem_ofs;   /* offset to group membership */
-	char **gr_mem;
 } WINBINDD_GR;
 
 
@@ -331,17 +330,17 @@
 				uint16 min_length_password;
 				uint16 password_history;
 				uint32 password_properties;
-				time_t expire;
-				time_t min_passwordage;
+				uint32 expire;
+				uint32 min_passwordage;
 			} policy;
 			uint32 reject_reason;
 			struct info3_text {
-				time_t logon_time;
-				time_t logoff_time;
-				time_t kickoff_time;
-				time_t pass_last_set_time;
-				time_t pass_can_change_time;
-				time_t pass_must_change_time;
+				uint32 logon_time;
+				uint32 logoff_time;
+				uint32 kickoff_time;
+				uint32 pass_last_set_time;
+				uint32 pass_can_change_time;
+				uint32 pass_must_change_time;
 				uint16 logon_count;
 				uint16 bad_pw_count;
 				uint32 user_rid;

Modified: trunk/source/include/includes.h
===================================================================
--- trunk/source/include/includes.h	2006-04-13 12:03:05 UTC (rev 15071)
+++ trunk/source/include/includes.h	2006-04-13 12:03:12 UTC (rev 15072)
@@ -21,6 +21,11 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+/* work around broken krb5.h on sles9 */
+#ifdef SIZEOF_LONG
+#undef SIZEOF_LONG
+#endif
+
 #ifndef NO_CONFIG_H /* for some tests */
 #include "config.h"
 #endif

Modified: trunk/source/nsswitch/winbind_nss_config.h
===================================================================
--- trunk/source/nsswitch/winbind_nss_config.h	2006-04-13 12:03:05 UTC (rev 15071)
+++ trunk/source/nsswitch/winbind_nss_config.h	2006-04-13 12:03:12 UTC (rev 15072)
@@ -24,6 +24,12 @@
 #ifndef _WINBIND_NSS_CONFIG_H
 #define _WINBIND_NSS_CONFIG_H
 
+/* shutup the compiler warnings due to krb5.h on i
+   64-bit sles9 */
+#ifdef SIZEOF_LONG
+#undef SIZEOF_LONG
+#endif
+
 /* Include header files from data in config.h file */
 
 #ifndef NO_CONFIG_H

Modified: trunk/source/nsswitch/winbindd_nss.h
===================================================================
--- trunk/source/nsswitch/winbindd_nss.h	2006-04-13 12:03:05 UTC (rev 15071)
+++ trunk/source/nsswitch/winbindd_nss.h	2006-04-13 12:03:12 UTC (rev 15072)
@@ -158,7 +158,6 @@
 	gid_t gr_gid;
 	uint32 num_gr_mem;
 	uint32 gr_mem_ofs;   /* offset to group membership */
-	char **gr_mem;
 } WINBINDD_GR;
 
 
@@ -332,17 +331,17 @@
 				uint16 min_length_password;
 				uint16 password_history;
 				uint32 password_properties;
-				time_t expire;
-				time_t min_passwordage;
+				uint32 expire;
+				uint32 min_passwordage;
 			} policy;
 			uint32 reject_reason;
 			struct info3_text {
-				time_t logon_time;
-				time_t logoff_time;
-				time_t kickoff_time;
-				time_t pass_last_set_time;
-				time_t pass_can_change_time;
-				time_t pass_must_change_time;
+				uint32 logon_time;
+				uint32 logoff_time;
+				uint32 kickoff_time;
+				uint32 pass_last_set_time;
+				uint32 pass_can_change_time;
+				uint32 pass_must_change_time;
 				uint16 logon_count;
 				uint16 bad_pw_count;
 				uint32 user_rid;