s3-build: only include nsswitch header where needed.

Guenther

nsswitch/wins.c

@@ -19,6 +19,8 @@
 */
 
 #include "includes.h"
+#include "nsswitch/winbind_nss.h"
+
 #ifdef HAVE_NS_API_H
 
 #include <ns_daemon.h>

source3/auth/server_info_sam.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "nsswitch/winbind_client.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

source3/include/includes.h

@@ -659,7 +659,6 @@ struct ntlmssp_state;
 #include "session.h"
 #include "mangle.h"
 #include "module.h"
-#include "nsswitch/winbind_client.h"
 #include "dbwrap.h"
 #include "packet.h"
 #include "ctdbd_conn.h"
@@ -671,8 +670,6 @@ struct ntlmssp_state;
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
 
-#include "nsswitch/winbind_nss.h"
-
 /* forward declarations from smbldap.c */
 
 #include "smbldap.h"

source3/lib/system_smbd.c

@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "nsswitch/winbind_client.h"
 
 #ifndef HAVE_GETGROUPLIST
 

source3/passdb/pdb_interface.c

@@ -24,6 +24,7 @@
 #include "secrets.h"
 #include "../librpc/gen_ndr/samr.h"
 #include "memcache.h"
+#include "nsswitch/winbind_client.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

source3/torture/nsstest.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "nsswitch/winbind_client.h"
 
 #ifdef malloc
 #undef malloc

source3/torture/torture.c

@@ -26,6 +26,7 @@
 #include "tldap_util.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "memcache.h"
+#include "nsswitch/winbind_client.h"
 
 extern char *optarg;
 extern int optind;

source3/utils/ntlm_auth.c

@@ -33,6 +33,7 @@
 #include <iniparser.h>
 #include "../lib/crypto/arcfour.h"
 #include "libads/kerberos_proto.h"
+#include "nsswitch/winbind_client.h"
 
 #ifndef PAM_WINBIND_CONFIG_FILE
 #define PAM_WINBIND_CONFIG_FILE "/etc/security/pam_winbind.conf"

source3/utils/ntlm_auth_diagnostics.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "utils/ntlm_auth.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "nsswitch/winbind_client.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

source3/winbindd/idmap_nss.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "nsswitch/winbind_client.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

source3/winbindd/winbindd.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "popt_common.h"
 #include "winbindd.h"
+#include "nsswitch/winbind_client.h"
 #include "../../nsswitch/libwbclient/wbc_async.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/srv_lsa.h"