summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-06-30 22:36:40 +0200
committerGünther Deschner <gd@samba.org>2010-07-01 23:20:40 +0200
commit56538be6af9d4d76bffe5f142ba6a62e978561da (patch)
tree8ef57fe823191908a1e202f8eb14b8761c9e15cf
parente64df82146cf62ae6e13b8e4c1adcc8b49b2fd6d (diff)
downloadsamba-56538be6af9d4d76bffe5f142ba6a62e978561da.tar.gz
samba-56538be6af9d4d76bffe5f142ba6a62e978561da.tar.bz2
samba-56538be6af9d4d76bffe5f142ba6a62e978561da.zip
s3-libads: move ads_dns out of main includes.
Guenther
-rw-r--r--source3/include/includes.h1
-rw-r--r--source3/include/proto.h31
-rw-r--r--source3/libads/dns.c1
-rw-r--r--source3/libads/dns.h (renamed from source3/include/ads_dns.h)29
-rw-r--r--source3/libads/ldap.c1
-rw-r--r--source3/libsmb/dsgetdcname.c1
-rw-r--r--source3/libsmb/namequery.c1
-rw-r--r--source3/utils/net_ads.c1
-rw-r--r--source3/utils/net_lookup.c1
9 files changed, 35 insertions, 32 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 0638fa3071..0e2110dab7 100644
--- 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 d41157e7cd..08a6ba7974 100644
--- 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 dc573e3a46..8d23ce1eba 100644
--- 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
index 24805f85a3..b747e97bb7 100644
--- 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 af48fdae5a..20a3439248 100644
--- 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 6af2eeb696..2803e74b66 100644
--- 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 20ba3410d5..c79480f707 100644
--- 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 700d98bd26..0fcbbc43f2 100644
--- 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 585a1185e6..1b31b32ff0 100644
--- 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)