s3: avoid global include of ads.h.

Guenther

16 files changed, 17 insertions, 1 deletions

diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 7aaaa9d272..def41c6c11 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -28,6 +28,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "../libds/common/flags.h"
+#include "ads.h"
 #include "libads/ldap_schema.h"
 #include "nss_info.h"
 
diff --git a/source3/winbindd/idmap_adex/cell_util.c b/source3/winbindd/idmap_adex/cell_util.c
index 257647a797..c32bb9179d 100644
--- a/source3/winbindd/idmap_adex/cell_util.c
+++ b/source3/winbindd/idmap_adex/cell_util.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "ads.h"
 #include "idmap_adex.h"
 #include "../libds/common/flags.h"
 
diff --git a/source3/winbindd/idmap_adex/domain_util.c b/source3/winbindd/idmap_adex/domain_util.c
index dae5415b3b..72643e97da 100644
--- a/source3/winbindd/idmap_adex/domain_util.c
+++ b/source3/winbindd/idmap_adex/domain_util.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "ads.h"
 #include "idmap_adex.h"
 
 #undef DBGC_CLASS
diff --git a/source3/winbindd/idmap_adex/gc_util.c b/source3/winbindd/idmap_adex/gc_util.c
index 9b4ce77b00..339234dfaf 100644
--- a/source3/winbindd/idmap_adex/gc_util.c
+++ b/source3/winbindd/idmap_adex/gc_util.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "ads.h"
 #include "idmap_adex.h"
 #include "libads/cldap.h"
 
diff --git a/source3/winbindd/idmap_adex/idmap_adex.c b/source3/winbindd/idmap_adex/idmap_adex.c
index aabc4da400..c815e75a29 100644
--- a/source3/winbindd/idmap_adex/idmap_adex.c
+++ b/source3/winbindd/idmap_adex/idmap_adex.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "ads.h"
 #include "idmap_adex.h"
 #include "nss_info.h"
 
diff --git a/source3/winbindd/idmap_adex/likewise_cell.c b/source3/winbindd/idmap_adex/likewise_cell.c
index f1abb24da2..24343eb554 100644
--- a/source3/winbindd/idmap_adex/likewise_cell.c
+++ b/source3/winbindd/idmap_adex/likewise_cell.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "ads.h"
 #include "idmap_adex.h"
 
 #undef DBGC_CLASS
diff --git a/source3/winbindd/idmap_adex/provider_unified.c b/source3/winbindd/idmap_adex/provider_unified.c
index f66d4dfbf4..999615ca3c 100644
--- a/source3/winbindd/idmap_adex/provider_unified.c
+++ b/source3/winbindd/idmap_adex/provider_unified.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "ads.h"
 #include "idmap_adex.h"
 
 #undef DBGC_CLASS
diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index de4652d684..ed55cd5dd4 100644
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "winbindd/winbindd.h"
 #include "idmap_hash.h"
+#include "ads.h"
 #include "nss_info.h"
 
 #undef DBGC_CLASS
diff --git a/source3/winbindd/nss_info.c b/source3/winbindd/nss_info.c
index 82eb6c7db5..67ffbf21cc 100644
--- a/source3/winbindd/nss_info.c
+++ b/source3/winbindd/nss_info.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "ads.h"
 #include "nss_info.h"
 
 static struct nss_function_entry *backends = NULL;
diff --git a/source3/winbindd/nss_info_template.c b/source3/winbindd/nss_info_template.c
index 1b69a8cb2b..0bc398e908 100644
--- a/source3/winbindd/nss_info_template.c
+++ b/source3/winbindd/nss_info_template.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "ads.h"
 #include "nss_info.h"
 
 /************************************************************************
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index c73e1a0aeb..949e206d04 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -25,6 +25,7 @@
 #include "winbindd.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
 #include "../libds/common/flags.h"
+#include "ads.h"
 
 #ifdef HAVE_ADS
 
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 631a14d413..5d12c2b3bc 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -28,6 +28,7 @@
 #include "tdb_validate.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_wbint.h"
+#include "ads.h"
 #include "nss_info.h"
 
 #undef DBGC_CLASS
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index b300357190..c10d82cb49 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -70,6 +70,7 @@
 #include "libads/sitename_cache.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "libsmb/clidgram.h"
+#include "ads.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c
index 22e135a381..ab8934bfd4 100644
--- a/source3/winbindd/winbindd_cred_cache.c
+++ b/source3/winbindd/winbindd_cred_cache.c
@@ -25,6 +25,7 @@
 #include "winbindd.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "smb_krb5.h"
+#include "libads/kerberos_proto.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 010245f05d..11b16310b4 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -32,6 +32,7 @@
 #include "smb_krb5.h"
 #include "../lib/crypto/arcfour.h"
 #include "../libcli/security/dom_sid.h"
+#include "ads.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index a26a9df889..eb9ca4bace 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -155,10 +155,11 @@ bool wcache_tdc_fetch_list( struct winbindd_tdc_domain **domains, size_t *num_do
 bool wcache_tdc_add_domain( struct winbindd_domain *domain );
 struct winbindd_tdc_domain * wcache_tdc_fetch_domain( TALLOC_CTX *ctx, const char *name );
 void wcache_tdc_clear( void );
+struct ads_struct;
 NTSTATUS nss_get_info_cached( struct winbindd_domain *domain, 
 			      const struct dom_sid *user_sid,
 			      TALLOC_CTX *ctx,
-			      ADS_STRUCT *ads, LDAPMessage *msg,
+			      struct ads_struct *ads, LDAPMessage *msg,
 			      const char **homedir, const char **shell,
 			      const char **gecos, gid_t *p_gid);
 bool wcache_store_seqnum(const char *domain_name, uint32_t seqnum,