s3-libads: move ads_dns out of main includes.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 0638fa3071e3b1fc8747025357ece1a1133fe2ac..0e2110dab703c44f1c6990bc6b31b1ef19036bb8 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -629,7 +629,6 @@ extern void *cmdline_lp_ctx;
 #include "krb5_env.h"
 #include "libads/ads_status.h"
 #include "ads.h"
-#include "ads_dns.h"
 #include "interfaces.h"
 #include "trans2.h"
 #include "../libcli/util/error.h"

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d41157e7cd3d606b31a800586f22b59182483bfb..08a6ba79749cf62481c0d543ba1b32b29d729a79 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1785,37 +1785,6 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 
 void ads_disp_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct security_descriptor *sd);
 
-/* The following definitions come from libads/dns.c  */
-
-NTSTATUS ads_dns_lookup_ns(TALLOC_CTX *ctx,
-                               const char *dnsdomain,
-                               struct dns_rr_ns **nslist,
-                               int *numns);
-NTSTATUS ads_dns_query_dcs(TALLOC_CTX *ctx,
-                          const char *realm,
-                          const char *sitename,
-                          struct dns_rr_srv **dclist,
-                          int *numdcs );
-NTSTATUS ads_dns_query_gcs(TALLOC_CTX *ctx,
-                          const char *realm,
-                          const char *sitename,
-                          struct dns_rr_srv **dclist,
-                          int *numdcs );
-NTSTATUS ads_dns_query_kdcs(TALLOC_CTX *ctx,
-                           const char *dns_forest_name,
-                           const char *sitename,
-                           struct dns_rr_srv **dclist,
-                           int *numdcs );
-NTSTATUS ads_dns_query_pdc(TALLOC_CTX *ctx,
-                          const char *dns_domain_name,
-                          struct dns_rr_srv **dclist,
-                          int *numdcs );
-NTSTATUS ads_dns_query_dcs_guid(TALLOC_CTX *ctx,
-                               const char *dns_forest_name,
-                               const struct GUID *domain_guid,
-                               struct dns_rr_srv **dclist,
-                               int *numdcs );
-
 /* The following definitions come from libads/kerberos.c  */
 
 int kerberos_kinit_password_ext(const char *principal,

diff --git a/source3/libads/dns.c b/source3/libads/dns.c
index dc573e3a462b8ba66203ab766e8c3284d6f88654..8d23ce1eba8a22fad8483ff8e8d5caea57196e69 100644 (file)
--- a/source3/libads/dns.c
+++ b/source3/libads/dns.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "libads/dns.h"
 
 /* AIX resolv.h uses 'class' in struct ns_rr */
 

diff --git a/source3/include/ads_dns.h b/source3/libads/dns.h
similarity index 59%
rename from source3/include/ads_dns.h
rename to source3/libads/dns.h
index 24805f85a3f090d298e87333d81128bff1012726..b747e97bb77e339c3e1478e082d78412ffaf61ff 100644 (file)
--- a/source3/include/ads_dns.h
+++ b/source3/libads/dns.h
@@ -57,5 +57,34 @@ struct dns_rr_ns {
        struct sockaddr_storage ss;
 };
 
+/* The following definitions come from libads/dns.c  */
 
+NTSTATUS ads_dns_lookup_ns(TALLOC_CTX *ctx,
+                               const char *dnsdomain,
+                               struct dns_rr_ns **nslist,
+                               int *numns);
+NTSTATUS ads_dns_query_dcs(TALLOC_CTX *ctx,
+                          const char *realm,
+                          const char *sitename,
+                          struct dns_rr_srv **dclist,
+                          int *numdcs );
+NTSTATUS ads_dns_query_gcs(TALLOC_CTX *ctx,
+                          const char *realm,
+                          const char *sitename,
+                          struct dns_rr_srv **dclist,
+                          int *numdcs );
+NTSTATUS ads_dns_query_kdcs(TALLOC_CTX *ctx,
+                           const char *dns_forest_name,
+                           const char *sitename,
+                           struct dns_rr_srv **dclist,
+                           int *numdcs );
+NTSTATUS ads_dns_query_pdc(TALLOC_CTX *ctx,
+                          const char *dns_domain_name,
+                          struct dns_rr_srv **dclist,
+                          int *numdcs );
+NTSTATUS ads_dns_query_dcs_guid(TALLOC_CTX *ctx,
+                               const char *dns_forest_name,
+                               const struct GUID *domain_guid,
+                               struct dns_rr_srv **dclist,
+                               int *numdcs );
 #endif /* _ADS_DNS_H */

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index af48fdae5a6572dd7717592047f94aa84be5b02f..20a3439248839534c4606f85eb892f5b345adf76 100644 (file)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libads/sitename_cache.h"
 #include "libads/cldap.h"
+#include "libads/dns.h"
 
 #ifdef HAVE_LDAP
 

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 6af2eeb6965e65bbe02830eecd9fd094e85c77a1..2803e74b66b85343a3bfbde48cbb6d4c14bd7f5c 100644 (file)
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -24,6 +24,7 @@
 #include "libads/sitename_cache.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "libads/cldap.h"
+#include "libads/dns.h"
 #include "libsmb/clidgram.h"
 
 #define DSGETDCNAME_FMT        "DSGETDCNAME/DOMAIN/%s"

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 20ba3410d50dd421d0216d1f22c60bfd9b461b8d..c79480f70744f59abcdd5864930cf203c063a2a3 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libads/sitename_cache.h"
+#include "libads/dns.h"
 #include "../libcli/netlogon.h"
 
 /* nmbd.c sets this to True. */

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 700d98bd264a1d5673d275849c3c81623591c19f..0fcbbc43f26a4a798ec38112062ea6701a4aa42f 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "nsswitch/libwbclient/wbclient.h"
 #include "libads/cldap.h"
+#include "libads/dns.h"
 
 #ifdef HAVE_ADS
 

diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 585a1185e6b08a595adc4c39f81f14c1b73066ee..1b31b32ff07d2cac8bdaa4c0c195018e1b9ecedd 100644 (file)
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -19,6 +19,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "libads/sitename_cache.h"
+#include "libads/dns.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 
 int net_lookup_usage(struct net_context *c, int argc, const char **argv)