[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  640fbf8 s4-dsdb: register the DCPROMO_OID control with the rootdse
       via  75d57db selftest: terminate selftest if we can't setup the environment
      from  f6a9708 s4-ldb: increase minor version for 2 new functions

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


- Log -----------------------------------------------------------------
commit 640fbf833b824d3c4c2ecfecdb75fade2ef70fa9
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 19 14:53:14 2010 +1100

    s4-dsdb: register the DCPROMO_OID control with the rootdse
    
    this is needed to allow it over ldap
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Tue Oct 19 04:44:23 UTC 2010 on sn-devel-104

commit 75d57dbc25738bcf01d404b329fda22641a774ff
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 19 14:49:17 2010 +1100

    selftest: terminate selftest if we can't setup the environment

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

Summary of changes:
 selftest/selftest.pl                         |    5 +++--
 source4/dsdb/samdb/ldb_modules/objectclass.c |    7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 7431bed..eabee7a 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -253,7 +253,7 @@ sub run_testsuite($$$$$)
 	if ($? == -1) {
 		Subunit::progress_pop();
 		Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
-		return 0;
+		exit(1);
 	} elsif ($? & 127) {
 		Subunit::end_testsuite($name, "error",
 			sprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127),  ($? & 128) ? 'with' : 'without'));
@@ -953,7 +953,8 @@ $envvarstr
 		if (not defined($envvars)) {
 			Subunit::start_testsuite($name);
 			Subunit::end_testsuite($name, "error",
-				"unable to set up environment $envname");
+				"unable to set up environment $envname - exiting");
+			exit(1);
 			next;
 		}
 
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 02c3e46..c389965 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -1498,6 +1498,13 @@ static int objectclass_init(struct ldb_module *module)
 	/* Look for the opaque to indicate we might have to cut down the DN of defaultObjectCategory */
 	ldb_module_set_private(module, ldb_get_opaque(ldb, DSDB_EXTENDED_DN_STORE_FORMAT_OPAQUE_NAME));
 
+	ret = ldb_mod_register_control(module, LDB_CONTROL_RODC_DCPROMO_OID);
+	if (ret != LDB_SUCCESS) {
+		ldb_debug(ldb, LDB_DEBUG_ERROR,
+			  "objectclass_init: Unable to register control DCPROMO with rootdse\n");
+		return ldb_operr(ldb);
+	}
+
 	return ret;
 }
 


-- 
Samba Shared Repository