r21673: Fix Samba 3 data read tests. I can't figure out why the upgrade one is broken...

[kai/samba.git] / source / scripting / libjs / upgrade.js

diff --git a/source/scripting/libjs/upgrade.js b/source/scripting/libjs/upgrade.js
index adb958a236d8be121c78edd297e41c6eadd8e810..3504d850f26236e1e1318cd257d0477585f1c832 100644 (file)
--- a/source/scripting/libjs/upgrade.js
+++ b/source/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;
 }