r15072: 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.
(This used to be commit b68e66d5c4f7348e674b8a009656ebfbbc06e288)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1e59f50008d271cede9712178d43dbef8ea3b392..a5f261282ce155a3065916a02b53f2ab22f6e089 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -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

diff --git a/source3/nsswitch/winbind_nss_config.h b/source3/nsswitch/winbind_nss_config.h
index fbd1bd22b3a196f98893e175308977034af8a11a..0400b2fb36d583f9e1b969651150f02c472f2549 100644 (file)
--- a/source3/nsswitch/winbind_nss_config.h
+++ b/source3/nsswitch/winbind_nss_config.h
@@ -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

diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h
index 5d0b1efaedc234e6f4e561e082cf2d6ca8e18177..fe09cd8a06d3b87afc7ec4a0274a00163a371e9c 100644 (file)
--- a/source3/nsswitch/winbindd_nss.h
+++ b/source3/nsswitch/winbindd_nss.h
@@ -157,7 +157,6 @@ typedef struct winbindd_gr {
        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 @@ struct winbindd_response {
                                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;