Rev 11323: Merge upstream. in file:///home/jelmer/bzr.samba/4.0-perlselftest/

Jelmer Vernooij jelmer at samba.org
Sat Mar 3 14:53:28 GMT 2007


At file:///home/jelmer/bzr.samba/4.0-perlselftest/

------------------------------------------------------------
revno: 11323
revision-id: jelmer at samba.org-20070303145304-b5tnsfjcm57kh2f6
parent: jelmer at samba.org-20070303012302-qogq7ne3x92eeuva
parent: svn-v2:21673 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-perlselftest
timestamp: Sat 2007-03-03 15:53:04 +0100
message:
  Merge upstream.
modified:
  source/scripting/libjs/upgrade.js svn-v2:9722 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscripting%2flibjs%2fupgrade.js
  source/setup/upgrade           svn-v2:9735 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fsetup%2fupgrade
    ------------------------------------------------------------
    revno: 11286.1.5.1.27.1.8.1.317
    merged: svn-v2:21673 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21671 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: jelmer at samba.org-20070303020345-gesw3rzz8mfrmmis
    committer: jelmer
    timestamp: Sat 2007-03-03 02:06:54 +0000
    message:
      Fix Samba 3 data read tests. I can't figure out why the upgrade one is broken, so that one is still disabled.
    ------------------------------------------------------------
    revno: 11286.1.5.1.27.1.8.1.316.1.1
    merged: jelmer at samba.org-20070303020345-gesw3rzz8mfrmmis
    parent: svn-v2:21671 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: SAMBA_4_0
    timestamp: Sat 2007-03-03 03:03:45 +0100
    message:
      Fix Samba 3 data read tests. I can't figure out why the upgrade one is broken, so that one is still disabled.
=== modified file 'source/scripting/libjs/upgrade.js'
--- a/source/scripting/libjs/upgrade.js	2007-02-01 12:16:01 +0000
+++ b/source/scripting/libjs/upgrade.js	2007-03-03 14:53:04 +0000
@@ -367,7 +367,26 @@
 				      strlower(subobj.HOSTNAME), 
 				      subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
-	rdn_list = split(".", subobj.REALM);
+	rdn_list = split(".", subobj.DNSDOMAIN);
+	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
+	subobj.DOMAINDN_LDB = "users.ldb";
+	subobj.ROOTDN       = subobj.DOMAINDN;
+
+	modules_list        = new Array("rootdse",
+					"kludge_acl",
+					"paged_results",
+					"server_sort",
+					"extended_dn",
+					"asq",
+					"samldb",
+					"password_hash",
+					"operational",
+					"objectclass",
+					"rdn_name",
+					"show_deleted",
+					"partition");
+	subobj.MODULES_LIST = join(",", modules_list);
+
 	return subobj;
 }
 

=== modified file 'source/setup/upgrade'
--- a/source/setup/upgrade	2006-01-22 08:32:34 +0000
+++ b/source/setup/upgrade	2007-03-03 02:06:54 +0000
@@ -95,7 +95,7 @@
 	subobj.REALM = options.realm;
 }
 
-provision(subobj, message, options.blank, paths, system_session, creds);
+provision(subobj, message, options.blank, paths, system_session, creds, undefined);
 
 var ret = upgrade(subobj,samba3,message,paths, system_session, creds);
 if (ret > 0) {



More information about the samba-cvs mailing list