The branch, master has been updated via c9169a5 s4-rpc: dnsserver: Do not return NS_GLUE records with VIEW_GLUE_DATA filter via 2036cbd s4-rpc: dnsserver: Correctly set rank for glue NS records via 9b720ab ctdb-build: Add missing dependency on popt via c53c3df ctdb-build: Remove unnecessary third_party symlink via 9f0b2f9 ldb: Fix check for third_party via 4f105b2 wafsamba: Correctly locate the 'third_party' directory from e411873 ctdb-build: Avoid unused variable warning in output from rpcgen
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c9169a5e987864473108d041513f1781740401ac Author: Amitay Isaacs <ami...@gmail.com> Date: Wed Jul 30 19:57:42 2014 +1000 s4-rpc: dnsserver: Do not return NS_GLUE records with VIEW_GLUE_DATA filter Bug: https://bugzilla.samba.org/show_bug.cgi?id=10751 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Thu Aug 21 11:36:55 CEST 2014 on sn-devel-104 commit 2036cbd9249c84d9b46370f0e8cd6a0264c737ba Author: Amitay Isaacs <ami...@gmail.com> Date: Wed Jul 30 18:53:44 2014 +1000 s4-rpc: dnsserver: Correctly set rank for glue NS records Bug: https://bugzilla.samba.org/show_bug.cgi?id=10751 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 9b720ab13923a91136c25bd80cd905a03e9ac95e Author: Amitay Isaacs <ami...@gmail.com> Date: Thu Aug 21 14:47:23 2014 +1000 ctdb-build: Add missing dependency on popt Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit c53c3dfeff1879b435f4fd3e63e430a93fa41e40 Author: Amitay Isaacs <ami...@gmail.com> Date: Thu Aug 21 14:46:54 2014 +1000 ctdb-build: Remove unnecessary third_party symlink Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 9f0b2f9503c31daeb6b0b3d97716d0ceee57450f Author: Amitay Isaacs <ami...@gmail.com> Date: Thu Aug 21 14:34:03 2014 +1000 ldb: Fix check for third_party Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 4f105b27b702de996d41976392740be11fd44eaf Author: Amitay Isaacs <ami...@gmail.com> Date: Thu Aug 21 14:33:42 2014 +1000 wafsamba: Correctly locate the 'third_party' directory Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/samba_third_party.py | 2 +- ctdb/third_party | 1 - ctdb/wscript | 2 +- lib/ldb/wscript | 4 ++-- source4/rpc_server/dnsserver/dnsdata.c | 2 +- source4/rpc_server/dnsserver/dnsdb.c | 9 ++++++--- 6 files changed, 11 insertions(+), 9 deletions(-) delete mode 120000 ctdb/third_party Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py index 36b98cb..46a1b94 100644 --- a/buildtools/wafsamba/samba_third_party.py +++ b/buildtools/wafsamba/samba_third_party.py @@ -6,7 +6,7 @@ from samba_bundled import * @conf def CHECK_FOR_THIRD_PARTY(conf): - return os.path.exists('third_party') + return os.path.exists(os.path.join(Utils.g_module.srcdir, 'third_party')) Build.BuildContext.CHECK_FOR_THIRD_PARTY = CHECK_FOR_THIRD_PARTY diff --git a/ctdb/third_party b/ctdb/third_party deleted file mode 120000 index d838c05..0000000 --- a/ctdb/third_party +++ /dev/null @@ -1 +0,0 @@ -../third_party \ No newline at end of file diff --git a/ctdb/wscript b/ctdb/wscript index 898df47..d1f112e 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -212,7 +212,7 @@ def build(bld): ctdb_message.c cmdline.c rb_tree.c system_common.c ctdb_fork.c'''), includes='include include/internal common . lib/util', - deps='replace popt talloc tevent tdb') + deps='replace popt talloc tevent tdb popt') bld.SAMBA_SUBSYSTEM('ctdb-common-util', source=bld.SUBDIR('common', diff --git a/lib/ldb/wscript b/lib/ldb/wscript index be04544..6d9e845 100755 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -13,7 +13,7 @@ while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5: srcdir = srcdir + '/..' sys.path.insert(0, srcdir + '/buildtools/wafsamba') -import wafsamba, samba_dist, Options +import wafsamba, samba_dist, Options, Utils samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent @@ -85,7 +85,7 @@ def configure(conf): def build(bld): bld.RECURSE('lib/tevent') - if os.path.exists('third_party'): + if bld.CHECK_FOR_THIRD_PARTY(): bld.RECURSE('third_party/popt') bld.RECURSE('lib/replace') diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c index fb2547f..4866006 100644 --- a/source4/rpc_server/dnsserver/dnsdata.c +++ b/source4/rpc_server/dnsserver/dnsdata.c @@ -806,7 +806,7 @@ WERROR dns_fill_records_array(TALLOC_CTX *mem_ctx, } } if (select_flag & DNS_RPC_VIEW_GLUE_DATA) { - if (dnsp_rec.rank == DNS_RANK_NS_GLUE) { + if (dnsp_rec.rank == DNS_RANK_GLUE) { found = true; } } diff --git a/source4/rpc_server/dnsserver/dnsdb.c b/source4/rpc_server/dnsserver/dnsdb.c index 8cdeae4..24e9e89 100644 --- a/source4/rpc_server/dnsserver/dnsdb.c +++ b/source4/rpc_server/dnsserver/dnsdb.c @@ -408,10 +408,13 @@ WERROR dnsserver_db_add_record(TALLOC_CTX *mem_ctx, rec = dns_to_dnsp_copy(mem_ctx, add_record); W_ERROR_HAVE_NO_MEMORY(rec); - /* Set the correct rank for the record. - * FIXME: add logic to check for glue records */ + /* Set the correct rank for the record. */ if (z->zoneinfo->dwZoneType == DNS_ZONE_TYPE_PRIMARY) { - rec->rank |= DNS_RANK_ZONE; + if (strcmp(name, "@") != 0 && rec->wType == DNS_TYPE_NS) { + rec->rank = DNS_RANK_NS_GLUE; + } else { + rec->rank |= DNS_RANK_ZONE; + } } else if (strcmp(z->name, ".") == 0) { rec->rank |= DNS_RANK_ROOT_HINT; } -- Samba Shared Repository