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/scripting | |
| 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/scripting')
| -rw-r--r-- | source4/scripting/libjs/upgrade.js | 22 |
1 files changed, 20 insertions, 2 deletions
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; } |