s3-build: only include nsswitch header where needed.

Guenther

diff --git a/nsswitch/wins.c b/nsswitch/wins.c
index aa95ec7340956cbf70bd5d8a3a66da71042e1e76..b4bc788f841815865eebfb6560d561e9475011a0 100644 (file)
--- a/nsswitch/wins.c
+++ b/nsswitch/wins.c
@@ -19,6 +19,8 @@
 */
 
 #include "includes.h"
+#include "nsswitch/winbind_nss.h"
+
 #ifdef HAVE_NS_API_H
 
 #include <ns_daemon.h>

diff --git a/source3/auth/server_info_sam.c b/source3/auth/server_info_sam.c
index 7a33aab2a23f65db754c46acba38c5a1bdb816c8..4731ad44f1ada9d5dcb0fcdb4f1b861a3a4cddc5 100644 (file)
--- a/source3/auth/server_info_sam.c
+++ b/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

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4392de9dafeeed83266e4ce0ad9613178bb49b05..d409a354a12f54b31e148088ca78bc1511bb67ce 100644 (file)
--- a/source3/include/includes.h
+++ b/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"

diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c
index b4447c5f9cd179ee86fea87edfc0a761f0f79584..37fac27b73ae1d82d9044b4dd1a96c2c2154cb92 100644 (file)
--- a/source3/lib/system_smbd.c
+++ b/source3/lib/system_smbd.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "nsswitch/winbind_client.h"
 
 #ifndef HAVE_GETGROUPLIST
 

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 3c297b2300b3946bb4a05b2a94b6591a5429387c..ddc7ad4e0a33d06e828a5608854ac00e8ce3446a 100644 (file)
--- a/source3/passdb/pdb_interface.c
+++ b/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

diff --git a/source3/torture/nsstest.c b/source3/torture/nsstest.c
index 8bb577e505429cdd164a31eaec6d850cd16f9f76..dcdfd1cb745f120c5323969b21912faeedaeb456 100644 (file)
--- a/source3/torture/nsstest.c
+++ b/source3/torture/nsstest.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "nsswitch/winbind_client.h"
 
 #ifdef malloc
 #undef malloc

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 2e35a1ff5da45dd77d8bea6e29a5e2501f0f8d54..fdff8a7d054c200f8cbc027bc7b5401b8eb05362 100644 (file)
--- a/source3/torture/torture.c
+++ b/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;

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index d234a3cd05553f35f9f329cfca7592193a75d7b7..6fd9fa33ab992e0b17e52a6aa3c191d8fd7c8658 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/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"

diff --git a/source3/utils/ntlm_auth_diagnostics.c b/source3/utils/ntlm_auth_diagnostics.c
index 3ee4acdd83f1f6e0c31250d170654c2265fa8dce..1b9b133e4fb60c4421078ca139a1c2d30f01769e 100644 (file)
--- a/source3/utils/ntlm_auth_diagnostics.c
+++ b/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

diff --git a/source3/winbindd/idmap_nss.c b/source3/winbindd/idmap_nss.c
index f50e6172baa117c0abb507205862a29db6773697..40adef29b852ca0868422b166399deb2eac3e6fc 100644 (file)
--- a/source3/winbindd/idmap_nss.c
+++ b/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

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 3a9643d7299dc02549840a65b6d683c1882db627..966ebadaea04e49461ded8e321b48c5ce1dbb58d 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/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"