1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00

Move source3/libads/dns.c to lib/addns

This commit is contained in:
Simo Sorce
2012-05-04 16:47:27 -04:00
committed by Alexander Bokovoy
parent cc3321c9ff
commit 34a65739d3
12 changed files with 27 additions and 15 deletions

View File

@ -19,7 +19,9 @@
*/
#include "includes.h"
#include "libads/dns.h"
#include "lib/util/util_net.h"
#include "lib/util/tsort.h"
#include "dnsquery.h"
/* AIX resolv.h uses 'class' in struct ns_rr */
@ -207,8 +209,8 @@ static bool ads_dns_parse_rr_srv( TALLOC_CTX *ctx, uint8_t *start, uint8_t *end,
srv->hostname = talloc_strdup( ctx, dcname );
DEBUG(10,("ads_dns_parse_rr_srv: Parsed %s [%u, %u, %u]\n",
srv->hostname,
DEBUG(10,("ads_dns_parse_rr_srv: Parsed %s [%u, %u, %u]\n",
srv->hostname,
srv->priority,
srv->weight,
srv->port));
@ -758,10 +760,10 @@ static NTSTATUS ads_dns_query_internal(TALLOC_CTX *ctx,
name = talloc_asprintf(ctx, "%s._tcp.%s._sites.%s._msdcs.%s",
servicename, sitename,
dc_pdc_gc_domains, realm);
} else {
} else {
name = talloc_asprintf(ctx, "%s._tcp.%s._msdcs.%s",
servicename, dc_pdc_gc_domains, realm);
}
}
if (!name) {
return NT_STATUS_NO_MEMORY;
}

5
lib/addns/wscript_build Normal file → Executable file
View File

@ -5,3 +5,8 @@ bld.SAMBA_LIBRARY('addns',
public_deps='talloc krb5 k5crypto com_err gssapi gssapi_krb5 uuid',
private_library=True,
vars=locals())
bld.SAMBA_SUBSYSTEM('DNSQUERY',
source='dnsquery.c',
deps='samba-util lmhosts resolv'
)

4
libcli/dns/wscript_build Normal file → Executable file
View File

@ -3,3 +3,7 @@
bld.SAMBA_SUBSYSTEM('LIBCLI_DNS',
source='dns.c',
deps='LIBTSOCKET tevent-util')
bld.SAMBA_SUBSYSTEM('DNS_HOSTS_FILE',
source='dns_hosts_file.c',
deps='samba-util errors')

4
libcli/nbt/wscript_build Normal file → Executable file
View File

@ -7,8 +7,8 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
)
bld.SAMBA_SUBSYSTEM('lmhosts',
source='lmhosts.c ../dns/dns_hosts_file.c',
deps='replace talloc'
source='lmhosts.c',
deps='DNS_HOSTS_FILE replace talloc'
)
bld.SAMBA_LIBRARY('cli-nbt',

View File

@ -544,7 +544,7 @@ LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
libsmb/namequery.o ../libcli/nbt/lmhosts.o ../libcli/dns/dns_hosts_file.o libsmb/conncache.o \
libads/dns.o libads/sitename_cache.o
../lib/addds/dnsquery.o libads/sitename_cache.o
NTERR_OBJ = ../libcli/util/nterr.o libsmb/smberr.o
DOSERR_OBJ = ../libcli/util/doserr.o

View File

@ -25,7 +25,7 @@
#include "ads.h"
#include "libads/sitename_cache.h"
#include "libads/cldap.h"
#include "libads/dns.h"
#include "../lib/addns/dnsquery.h"
#include "../libds/common/flags.h"
#include "smbldap.h"
#include "../libcli/security/security.h"

View File

@ -24,7 +24,7 @@
#include "libads/sitename_cache.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "libads/cldap.h"
#include "libads/dns.h"
#include "../lib/addns/dnsquery.h"
#include "libsmb/clidgram.h"
/* 15 minutes */

View File

@ -21,7 +21,7 @@
#include "includes.h"
#include "../lib/util/tevent_ntstatus.h"
#include "libads/sitename_cache.h"
#include "libads/dns.h"
#include "../lib/addns/dnsquery.h"
#include "../libcli/netlogon/netlogon.h"
#include "lib/async_req/async_sock.h"
#include "libsmb/nmblib.h"

View File

@ -28,7 +28,7 @@
#include "nsswitch/libwbclient/wbclient.h"
#include "ads.h"
#include "libads/cldap.h"
#include "libads/dns.h"
#include "../lib/addns/dnsquery.h"
#include "../libds/common/flags.h"
#include "librpc/gen_ndr/libnet_join.h"
#include "libnet/libnet_join.h"

View File

@ -19,7 +19,7 @@
#include "includes.h"
#include "utils/net.h"
#include "libads/sitename_cache.h"
#include "libads/dns.h"
#include "../lib/addns/dnsquery.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "smb_krb5.h"
#include "../libcli/security/security.h"

View File

@ -113,7 +113,8 @@ SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c libsmb/conncache.c
libads/dns.c libads/sitename_cache.c'''
libads/sitename_cache.c'''
LIBNTLMSSP_SRC = '''
libsmb/ntlmssp.c
@ -1006,7 +1007,7 @@ bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
bld.SAMBA3_SUBSYSTEM('LIBNMB',
source=LIBNMB_SRC,
deps='lmhosts resolv',
deps='DNSQUERY lmhosts resolv',
vars=locals())
bld.SAMBA3_SUBSYSTEM('SERVICES',