summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-08-18 12:42:49 +0200
committerGünther Deschner <gd@samba.org>2010-08-26 00:20:28 +0200
commit7ff7eb0b5299f90a313986bfc547f48ef9f8dc9c (patch)
tree2986bf153b364187cd11c266711de962e1d15ab1
parent08eff4d311ef3dd4973645e28a7669db4c383cad (diff)
downloadsamba-7ff7eb0b5299f90a313986bfc547f48ef9f8dc9c.tar.gz
samba-7ff7eb0b5299f90a313986bfc547f48ef9f8dc9c.tar.bz2
samba-7ff7eb0b5299f90a313986bfc547f48ef9f8dc9c.zip
s3-build: only include nsswitch header where needed.
Guenther
-rw-r--r--nsswitch/wins.c2
-rw-r--r--source3/auth/server_info_sam.c1
-rw-r--r--source3/include/includes.h3
-rw-r--r--source3/lib/system_smbd.c1
-rw-r--r--source3/passdb/pdb_interface.c1
-rw-r--r--source3/torture/nsstest.c1
-rw-r--r--source3/torture/torture.c1
-rw-r--r--source3/utils/ntlm_auth.c1
-rw-r--r--source3/utils/ntlm_auth_diagnostics.c1
-rw-r--r--source3/winbindd/idmap_nss.c1
-rw-r--r--source3/winbindd/winbindd.c1
11 files changed, 11 insertions, 3 deletions
diff --git a/nsswitch/wins.c b/nsswitch/wins.c
index aa95ec7340..b4bc788f84 100644
--- 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 7a33aab2a2..4731ad44f1 100644
--- 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 4392de9daf..d409a354a1 100644
--- 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 b4447c5f9c..37fac27b73 100644
--- 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 3c297b2300..ddc7ad4e0a 100644
--- 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 8bb577e505..dcdfd1cb74 100644
--- 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 2e35a1ff5d..fdff8a7d05 100644
--- 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 d234a3cd05..6fd9fa33ab 100644
--- 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 3ee4acdd83..1b9b133e4f 100644
--- 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 f50e6172ba..40adef29b8 100644
--- 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 3a9643d729..966ebadaea 100644
--- 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"