[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  aabfb71 s4:subtree_delete LDB module - remove the DN from an error message
       via  0fb9671 s4:setup/provision_rootdse_add.ldif - provide informations in the right order
      from  505eaa9 s3-selftest: enable smb2 torture tests against samba3.

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


- Log -----------------------------------------------------------------
commit aabfb7162c1e87ebfec1829488a2cd20af18ae0e
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Oct 5 16:41:17 2010 +0200

    s4:subtree_delete LDB module - remove the DN from an error message
    
    It may looks funny but the DN output prevents older ADUC versions (tested with
    release 2000) to perform subtree deletes properly. Version 2008 has this fixed.
    
    Additionally some smaller changes ("%u" for printing unsigned integers,
    module name prefix, nicer line-wrap).
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Tue Oct  5 16:48:19 UTC 2010 on sn-devel-104

commit 0fb9671a01475d9c79c99ab8ae0f08c2f198097d
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Oct 5 15:57:45 2010 +0200

    s4:setup/provision_rootdse_add.ldif - provide informations in the right order
    
    Doesn't change much - but nicer to read.
    
    Btw: is the testdata/samba3 stuff still needed ("provision_samba3sam.ldif"...)?
    It seems a bit outdated.

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/subtree_delete.c |    9 ++++++---
 source4/setup/provision_rootdse_add.ldif        |    4 ++--
 testdata/samba3/provision_samba3sam.ldif        |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/subtree_delete.c b/source4/dsdb/samdb/ldb_modules/subtree_delete.c
index 34914d2..3817d22 100644
--- a/source4/dsdb/samdb/ldb_modules/subtree_delete.c
+++ b/source4/dsdb/samdb/ldb_modules/subtree_delete.c
@@ -61,10 +61,13 @@ static int subtree_delete(struct ldb_module *module, struct ldb_request *req)
 	}
 	if (res->count > 0) {
 		if (ldb_request_get_control(req, LDB_CONTROL_TREE_DELETE_OID) == NULL) {
+			/* Do not add any DN outputs to this error string!
+			 * Some MMC consoles (eg release 2000) have a strange
+			 * bug and prevent subtree deletes afterwards. */
 			ldb_asprintf_errstring(ldb_module_get_ctx(module),
-					       "Cannot delete %s, not a leaf node "
-					       "(has %d children)\n",
-					       ldb_dn_get_linearized(req->op.del.dn),
+					       "subtree_delete: Unable to "
+					       "delete a non-leaf node "
+					       "(it has %u children)!",
 					       res->count);
 			talloc_free(res);
 			return LDB_ERR_NOT_ALLOWED_ON_NON_LEAF;
diff --git a/source4/setup/provision_rootdse_add.ldif b/source4/setup/provision_rootdse_add.ldif
index 47792a2..2e2ed66 100644
--- a/source4/setup/provision_rootdse_add.ldif
+++ b/source4/setup/provision_rootdse_add.ldif
@@ -6,12 +6,12 @@ defaultNamingContext: ${DOMAINDN}
 rootDomainNamingContext: ${ROOTDN}
 configurationNamingContext: ${CONFIGDN}
 schemaNamingContext: ${SCHEMADN}
-supportedLDAPVersion: 3
 supportedLDAPVersion: 2
+supportedLDAPVersion: 3
 isSynchronized: FALSE
 vendorName: Samba Team (http://samba.org)
 supportedCapabilities: 1.2.840.113556.1.4.800
-supportedCapabilities: 1.2.840.113556.1.4.1791
 supportedCapabilities: 1.2.840.113556.1.4.1670
+supportedCapabilities: 1.2.840.113556.1.4.1791
 supportedCapabilities: 1.2.840.113556.1.4.1935
 supportedCapabilities: 1.2.840.113556.1.4.2080
diff --git a/testdata/samba3/provision_samba3sam.ldif b/testdata/samba3/provision_samba3sam.ldif
index e196ca6..03a69f1 100644
--- a/testdata/samba3/provision_samba3sam.ldif
+++ b/testdata/samba3/provision_samba3sam.ldif
@@ -64,8 +64,8 @@ defaultNamingContext: ${BASEDN}
 rootDomainNamingContext: ${BASEDN}
 configurationNamingContext: CN=Configuration,${BASEDN}
 schemaNamingContext: CN=Schema,CN=Configuration,${BASEDN}
-supportedLDAPVersion: 3
 supportedLDAPVersion: 2
+supportedLDAPVersion: 3
 dnsHostName: ${DNSNAME}
 ldapServiceName: ${DNSDOMAIN}:${NETBIOSNAME}$@${REALM}
 serverName: CN=${NETBIOSNAME},CN=Servers,CN=Default-First-Site,CN=Sites,CN=Configuration,${BASEDN}


-- 
Samba Shared Repository