summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsource4/script/tests/tests_all.sh1
-rw-r--r--source4/scripting/libjs/upgrade.js22
-rwxr-xr-xsource4/setup/upgrade2
-rwxr-xr-xtestdata/samba3/verify8
4 files changed, 30 insertions, 3 deletions
diff --git a/source4/script/tests/tests_all.sh b/source4/script/tests/tests_all.sh
index efabbec03b..b4b0d2d38b 100755
--- a/source4/script/tests/tests_all.sh
+++ b/source4/script/tests/tests_all.sh
@@ -12,3 +12,4 @@
$SRCDIR/script/tests/test_pidl.sh
$SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX
$SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD ""
+ $SRCDIR/script/tests/test_s3upgrade.sh $PREFIX/upgrade
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index adb958a236..3504d850f2 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -357,7 +357,6 @@ function upgrade_provision(samba3)
subobj.NTTIME = nttime;
subobj.LDAPTIME = ldaptime;
subobj.DATESTRING = datestring;
- subobj.USN = nextusn;
subobj.ROOT = findnss(nss.getpwnam, "root");
subobj.NOBODY = findnss(nss.getpwnam, "nobody");
subobj.NOGROUP = findnss(nss.getgrnam, "nogroup", "nobody");
@@ -368,7 +367,26 @@ function upgrade_provision(samba3)
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;
}
diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index f2d1a870cc..f05e22f2e0 100755
--- a/source4/setup/upgrade
+++ b/source4/setup/upgrade
@@ -95,7 +95,7 @@ if (options.realm != undefined) {
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) {
diff --git a/testdata/samba3/verify b/testdata/samba3/verify
index ed6ed95189..ca495b137d 100755
--- a/testdata/samba3/verify
+++ b/testdata/samba3/verify
@@ -5,6 +5,13 @@
Written by Jelmer Vernooij, 2005.
*/
+var sys;
+var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA");
+if (options == undefined) {
+ println("Failed to parse options");
+ return -1;
+}
+
libinclude("base.js");
var path = substr(ARGV[0], 0, -strlen("verify"));
@@ -49,3 +56,4 @@ assert(s.policy.bad_lockout_minutes == 0);
println("account policies ok");
+exit(0);