diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-21 22:24:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:00:59 -0500 |
| commit | a734e98b516aec012ee2a9c866eb6debe663d14e (patch) | |
| tree | b766e29e564a3896aa962c90ee5ef50fcfd27158 | |
| parent | 927e5876ad1ef4a4469887dd01d49f2f3ceb3d89 (diff) | |
| download | samba-a734e98b516aec012ee2a9c866eb6debe663d14e.tar.gz samba-a734e98b516aec012ee2a9c866eb6debe663d14e.tar.bz2 samba-a734e98b516aec012ee2a9c866eb6debe663d14e.zip | |
r18798: use libreplace headers in pam and nss modules
this hopefully fixes the build on AIX
metze
(This used to be commit ef1001f5a269f3d6a66f40e3fb01eccc807dcd7e)
| -rw-r--r-- | source3/nsswitch/pam_winbind.h | 20 | ||||
| -rw-r--r-- | source3/nsswitch/winbind_nss_aix.c | 7 | ||||
| -rw-r--r-- | source3/nsswitch/winbind_nss_config.h | 50 |
3 files changed, 8 insertions, 69 deletions
diff --git a/source3/nsswitch/pam_winbind.h b/source3/nsswitch/pam_winbind.h index eea4328105..0072f67904 100644 --- a/source3/nsswitch/pam_winbind.h +++ b/source3/nsswitch/pam_winbind.h @@ -4,23 +4,9 @@ Shirish Kalele 2000 */ -#ifdef HAVE_FEATURES_H -#include <features.h> -#endif - -#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> +#include "lib/replace/replace.h" +#include "system/syslog.h" +#include "system/time.h" #define MODULE_NAME "pam_winbind" #define PAM_SM_AUTH diff --git a/source3/nsswitch/winbind_nss_aix.c b/source3/nsswitch/winbind_nss_aix.c index 5b3aaeb8d7..6a39b4b7c4 100644 --- a/source3/nsswitch/winbind_nss_aix.c +++ b/source3/nsswitch/winbind_nss_aix.c @@ -45,13 +45,8 @@ */ -#include <stdlib.h> -#include <string.h> -#include <usersec.h> -#include <errno.h> -#include <stdarg.h> - #include "winbind_client.h" +#include <usersec.h> #define WB_AIX_ENCODED '_' diff --git a/source3/nsswitch/winbind_nss_config.h b/source3/nsswitch/winbind_nss_config.h index f7fa261f7d..8ca51c9287 100644 --- a/source3/nsswitch/winbind_nss_config.h +++ b/source3/nsswitch/winbind_nss_config.h @@ -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 |