diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-03-03 02:06:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:08 -0500 |
| commit | 99fb785ea1dcf8ccc7bcbceed350178884e824b1 (patch) | |
| tree | 5c6829f8ea7fc49480bda8313d390cbb612e9f99 /source4 | |
| parent | 1cc7b6e7397444a859c78e5ecc61f53dd1017436 (diff) | |
| download | samba-99fb785ea1dcf8ccc7bcbceed350178884e824b1.tar.gz samba-99fb785ea1dcf8ccc7bcbceed350178884e824b1.tar.bz2 samba-99fb785ea1dcf8ccc7bcbceed350178884e824b1.zip | |
r21673: Fix Samba 3 data read tests. I can't figure out why the upgrade one is broken, so that one is still disabled.
(This used to be commit ef794f03d50022a77303c77045a04d9407d07cbc)
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/script/tests/tests_all.sh | 1 | ||||
| -rw-r--r-- | source4/scripting/libjs/upgrade.js | 22 | ||||
| -rwxr-xr-x | source4/setup/upgrade | 2 |
3 files changed, 22 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) { |