From 56538be6af9d4d76bffe5f142ba6a62e978561da Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 30 Jun 2010 22:36:40 +0200 Subject: s3-libads: move ads_dns out of main includes. Guenther --- source3/include/ads_dns.h | 61 ---------------------------------------------- source3/include/includes.h | 1 - source3/include/proto.h | 31 ----------------------- 3 files changed, 93 deletions(-) delete mode 100644 source3/include/ads_dns.h (limited to 'source3/include') diff --git a/source3/include/ads_dns.h b/source3/include/ads_dns.h deleted file mode 100644 index 24805f85a3..0000000000 --- a/source3/include/ads_dns.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * Internal DNS query structures - * Copyright (C) Gerald Carter 2006. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#ifndef _ADS_DNS_H -#define _ADS_DNS_H - -/* DNS query section in replies */ - -struct dns_query { - const char *hostname; - uint16 type; - uint16 in_class; -}; - -/* DNS RR record in reply */ - -struct dns_rr { - const char *hostname; - uint16 type; - uint16 in_class; - uint32 ttl; - uint16 rdatalen; - uint8 *rdata; -}; - -/* SRV records */ - -struct dns_rr_srv { - const char *hostname; - uint16 priority; - uint16 weight; - uint16 port; - size_t num_ips; - struct sockaddr_storage *ss_s; /* support multi-homed hosts */ -}; - -/* NS records */ - -struct dns_rr_ns { - const char *hostname; - struct sockaddr_storage ss; -}; - - -#endif /* _ADS_DNS_H */ 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, -- cgit