svn commit: samba r18798 - in branches/SAMBA_3_0/source/nsswitch: .

[metze at samba.org]

Author: metze
Date: 2006-09-21 22:24:53 +0000 (Thu, 21 Sep 2006)
New Revision: 18798

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

Log:
use libreplace headers in pam and nss modules

this hopefully fixes the build on AIX

metze

Modified:
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.h
   branches/SAMBA_3_0/source/nsswitch/winbind_nss_aix.c
   branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.h
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.h	2006-09-21 21:21:31 UTC (rev 18797)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.h	2006-09-21 22:24:53 UTC (rev 18798)
@@ -4,24 +4,10 @@
    Shirish Kalele 2000
 */
 
-#ifdef HAVE_FEATURES_H
-#include <features.h>
-#endif
+#include "lib/replace/replace.h"
+#include "system/syslog.h"
+#include "system/time.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
-#include <string.h>
-#include <syslog.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <time.h>
-
-#include <config.h>
-
 #define MODULE_NAME "pam_winbind"
 #define PAM_SM_AUTH
 #define PAM_SM_ACCOUNT

Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_aix.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbind_nss_aix.c	2006-09-21 21:21:31 UTC (rev 18797)
+++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_aix.c	2006-09-21 22:24:53 UTC (rev 18798)
@@ -45,14 +45,9 @@
 
 */
 
-#include <stdlib.h>
-#include <string.h>
+#include "winbind_client.h"
 #include <usersec.h>
-#include <errno.h>
-#include <stdarg.h>
 
-#include "winbind_client.h"
-
 #define WB_AIX_ENCODED '_'
 
 static int debug_enabled;

Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h	2006-09-21 21:21:31 UTC (rev 18797)
+++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h	2006-09-21 22:24:53 UTC (rev 18798)
@@ -33,55 +33,13 @@
 /* Include header files from data in config.h file */
 
 #ifndef NO_CONFIG_H
-#include <config.h>
+#include "lib/replace/replace.h"
 #endif
 
-#include <stdio.h>
+#include "system/passwd.h"
+#include "system/network.h"
+#include "system/filesys.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#ifdef HAVE_UNIXSOCKET
-#include <sys/un.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#else
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <pwd.h>
 #include "nsswitch/winbind_nss.h"
 
 /* I'm trying really hard not to include anything from smb.h with the