summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-04-13 12:03:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:01 -0500
commit9de61b560ab6df0ed6ce99c8267fafbde9b00045 (patch)
tree3d7957d123d72ade336b79d41b75717b2576fa1f /source3
parent87029b8b4ad60042f5044076930dc69b32c72b54 (diff)
downloadsamba-9de61b560ab6df0ed6ce99c8267fafbde9b00045.tar.gz
samba-9de61b560ab6df0ed6ce99c8267fafbde9b00045.tar.bz2
samba-9de61b560ab6df0ed6ce99c8267fafbde9b00045.zip
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)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/includes.h5
-rw-r--r--source3/nsswitch/winbind_nss_config.h6
-rw-r--r--source3/nsswitch/winbindd_nss.h17
3 files changed, 19 insertions, 9 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1e59f50008..a5f261282c 100644
--- 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 fbd1bd22b3..0400b2fb36 100644
--- 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 5d0b1efaed..fe09cd8a06 100644
--- 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;