[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Mon May 13 23:08:02 MDT 2013


The branch, master has been updated
       via  3fda852 selftests-drs: make our generated class subclass of classschema
       via  33b5479 Export PROMOTED_DC related variable
       via  2bdf2c5 dsdb: make the name of non related class more obvious
      from  fde1757 build: Add missing dep from vfs_nfs4acl_xattr to NDR_NFS4ACL

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


- Log -----------------------------------------------------------------
commit 3fda85276b9a3b3df6c5f1341dd586606deacfb1
Author: Matthieu Patou <mat at matws.net>
Date:   Mon May 6 00:58:28 2013 -0700

    selftests-drs: make our generated class subclass of classschema
    
    Without this change objectclass=["top", "classSchema", "Foobar"] will
    not be sorted correctly and will generated an error saying that class
    Foobar is unreleated to classSchema (which is not true). It's mimicing what
    other classes of the default schema are doing (ie. contact)
    
    Signed-off-by: Matthieu Patou <mat at matws.net>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue May 14 07:07:19 CEST 2013 on sn-devel-104

commit 33b54799a61eb6873eaeea2e7853f1314d8e6eee
Author: Matthieu Patou <mat at matws.net>
Date:   Mon May 13 09:16:24 2013 -0700

    Export PROMOTED_DC related variable
    
    Signed-off-by: Matthieu Patou <mat at matws.net>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2bdf2c56cc1f7635441cf3b13d94941157b047f8
Author: Matthieu Patou <mat at matws.net>
Date:   Mon May 6 01:09:05 2013 -0700

    dsdb: make the name of non related class more obvious
    
    Signed-off-by: Matthieu Patou <mat at matws.net>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 selftest/selftest.pl                         |    5 +++++
 selftest/selftest.py                         |    6 ++++++
 source4/dsdb/samdb/ldb_modules/objectclass.c |    5 +++--
 source4/torture/drs/python/repl_schema.py    |    3 ++-
 4 files changed, 16 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 639c8a2..cc947a1 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -692,6 +692,11 @@ my @exported_envvars = (
 	"VAMPIRE_DC_NETBIOSNAME",
 	"VAMPIRE_DC_NETBIOSALIAS",
 
+	"PROMOTED_DC_SERVER",
+	"PROMOTED_DC_SERVER_IP",
+	"PROMOTED_DC_NETBIOSNAME",
+	"PROMOTED_DC_NETBIOSALIAS",
+
 	# server stuff
 	"SERVER",
 	"SERVER_IP",
diff --git a/selftest/selftest.py b/selftest/selftest.py
index af2e552..2da1ef8 100755
--- a/selftest/selftest.py
+++ b/selftest/selftest.py
@@ -388,6 +388,12 @@ exported_envvars = [
     "VAMPIRE_DC_NETBIOSNAME",
     "VAMPIRE_DC_NETBIOSALIAS",
 
+    # domain controller stuff for Vampired DC
+    "PROMOTED_DC_SERVER",
+    "PROMOTED_DC_SERVER_IP",
+    "PROMOTED_DC_NETBIOSNAME",
+    "PROMOTED_DC_NETBIOSALIAS",
+
     # server stuff
     "SERVER",
     "SERVER_IP",
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index de154ec..f6f7338 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -127,8 +127,9 @@ static int check_unrelated_objectclasses(struct ldb_module *module,
 		}
 
 		ldb_asprintf_errstring(ldb,
-				       "objectclass: the objectclass '%s' seems to be unrelated to the entry!",
-				       tmp_class->lDAPDisplayName);
+				       "objectclass: the objectclass '%s' seems to be unrelated to %s!",
+				       tmp_class->lDAPDisplayName,
+				       struct_objectclass->lDAPDisplayName);
 		return LDB_ERR_OBJECT_CLASS_VIOLATION;
 	}
 
diff --git a/source4/torture/drs/python/repl_schema.py b/source4/torture/drs/python/repl_schema.py
index cbed640..aefeadb 100644
--- a/source4/torture/drs/python/repl_schema.py
+++ b/source4/torture/drs/python/repl_schema.py
@@ -174,7 +174,8 @@ class DrsReplSchemaTestCase(drs_base.DrsBaseTestCase):
         # add a base classSchema class so we can use our new
         # attribute in class definition in a sibling class
         (c_ldn, c_dn) = self._schema_new_class(self.ldb_dc1, "cls-A",
-                                               {"systemMayContain": a_ldn})
+                                               {"systemMayContain": a_ldn,
+                                                "subClassOf": "classSchema"})
         # add new classSchema object with value for a_ldb attribute
         (c_ldn, c_dn) = self._schema_new_class(self.ldb_dc1, "cls-B",
                                                {"objectClass": ["top", "classSchema", c_ldn],


-- 
Samba Shared Repository


More information about the samba-cvs mailing list