[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  5a6a9ea s4-dns: ensure we get the right case on the grant rule for administrator
      from  c0297e5 waf: fixed tabs/spaces for python3.0

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5a6a9ea45c248281314bf8d4beb520db79055d02
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Nov 8 11:55:02 2010 +1100

    s4-dns: ensure we get the right case on the grant rule for administrator
    
    it may be 'Administrator' in the database, and bind match rules are
    case sensitive
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Mon Nov  8 01:41:43 UTC 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/dns/dns_update.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c
index ae5be44..3c625db 100644
--- a/source4/dsdb/dns/dns_update.c
+++ b/source4/dsdb/dns/dns_update.c
@@ -111,7 +111,7 @@ static void dnsupdate_rebuild(struct dnsupdate_service *service)
 	TALLOC_FREE(service->confupdate.subreq);
 
 	ret = ldb_search(service->samdb, tmp_ctx, &res, NULL, LDB_SCOPE_SUBTREE,
-			 attrs, "(&(primaryGroupID=%u)(objectClass=computer))",
+			 attrs, "(|(samaccountname=administrator)(&(primaryGroupID=%u)(objectClass=computer)))",
 			 DOMAIN_RID_DCS);
 	if (ret != LDB_SUCCESS) {
 		DEBUG(0,(__location__ ": Unable to find DCs list - %s", ldb_errstring(service->samdb)));
@@ -154,7 +154,6 @@ static void dnsupdate_rebuild(struct dnsupdate_service *service)
 		dprintf(fd, "/* End of static entries */\n");
 	}
 	dprintf(fd, "\tgrant %s ms-self * A AAAA;\n", realm);
-	dprintf(fd, "\tgrant administrator@%s wildcard * A AAAA SRV CNAME TXT;\n", realm);
 
 	for (i=0; i<res->count; i++) {
 		const char *acctname;


-- 
Samba Shared Repository