The branch, master has been updated via 518484a dns_hosts_file: move to a separate subsystem via 337353b s3-configure.in: when ADS support is disabled, unset HAVE_GSSAPI from 0bf6ec8 s3:selftest: run smbtorture3 CLEANUP3 in the s3dc:local environment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 518484af8d4960b483e40fbb244e284532efd267 Author: Alexander Bokovoy <a...@samba.org> Date: Fri May 25 18:45:17 2012 +0300 dns_hosts_file: move to a separate subsystem After discussion with Kai move dns_hosts_file to a separate subsystem and merge it into libaddns private library for s3/s4 client use. Also remove dependency in libcli/nbt, the code from libcli/dns subsystems is not used there at all. Autobuild-User: Alexander Bokovoy <a...@samba.org> Autobuild-Date: Fri May 25 22:22:44 CEST 2012 on sn-devel-104 commit 337353bd3c752a41b49381486b07fe91634e6c22 Author: Alexander Bokovoy <a...@samba.org> Date: Fri May 25 13:25:12 2012 +0300 s3-configure.in: when ADS support is disabled, unset HAVE_GSSAPI ----------------------------------------------------------------------- Summary of changes: lib/addns/wscript_build | 2 +- libcli/dns/wscript_build | 12 +++++++----- libcli/nbt/wscript_build | 2 +- source3/configure.in | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/addns/wscript_build b/lib/addns/wscript_build index 15fb620..513060d 100755 --- a/lib/addns/wscript_build +++ b/lib/addns/wscript_build @@ -2,6 +2,6 @@ bld.SAMBA_LIBRARY('addns', source='dnsquery.c dnsrecord.c dnsutils.c dnssock.c dnsgss.c dnsmarshall.c error.c', - public_deps='clidns samba-util gssapi uuid resolv', + public_deps='dnshostsfile samba-util gssapi uuid resolv', private_library=True, vars=locals()) diff --git a/libcli/dns/wscript_build b/libcli/dns/wscript_build index 03025ad..421dd6d 100755 --- a/libcli/dns/wscript_build +++ b/libcli/dns/wscript_build @@ -1,7 +1,9 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('clidns', - source='dns.c dns_hosts_file.c', - public_deps='LIBTSOCKET tevent-util', - private_library=True, - vars=locals()) +bld.SAMBA_SUBSYSTEM('clidns', + source='dns.c', + public_deps='LIBTSOCKET tevent-util') + +bld.SAMBA_SUBSYSTEM('dnshostsfile', + source='dns_hosts_file.c', + public_deps='samba-util errors') diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build index a8c239c..faf818e 100755 --- a/libcli/nbt/wscript_build +++ b/libcli/nbt/wscript_build @@ -8,7 +8,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF', bld.SAMBA_SUBSYSTEM('lmhosts', source='lmhosts.c', - deps='clidns replace talloc' + deps='replace talloc' ) bld.SAMBA_LIBRARY('cli-nbt', diff --git a/source3/configure.in b/source3/configure.in index 3e35d8f..f0a76a1 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4131,6 +4131,7 @@ if test x"$with_ads_support" != x"no"; then AC_REMOVE_DEFINE(HAVE_GSSAPI_H) AC_REMOVE_DEFINE(HAVE_GSSAPI_GSSAPI_GENERIC_H) AC_REMOVE_DEFINE(HAVE_GSSAPI_GSSAPI_H) + AC_REMOVE_DEFINE(HAVE_GSSAPI) KRB5_LIBS="" with_ads_support=no fi -- Samba Shared Repository