r9756: One-way upgrade from Samba3->Samba4 basically works now

[sfrench/samba-autobuild/.git] / source / scripting / libjs / provision.js

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index afa5adaa9f58ea7c4b1074a266ca7213d0f41d8b..b43d435ca9bc37c97f98b461b5256c5853b18197 100644 (file)
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -217,6 +217,8 @@ function provision(subobj, message, blank)
        subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
        subobj.DOMAIN      = strupper(subobj.DOMAIN);
        subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
+       var rdns = split(",", subobj.BASEDN);
+       subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
        data = add_foreign(data, "S-1-5-7",  "Anonymous",           "${NOBODY}");
        data = add_foreign(data, "S-1-1-0",  "World",               "${NOGROUP}");
@@ -291,15 +293,14 @@ function provision_guess()
        subobj.ROOT         = findnss(nss.getpwnam, "root");
        subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
        subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
-       subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root");
+       subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff");
        subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other");
        subobj.DNSDOMAIN    = strlower(subobj.REALM);
        subobj.DNSNAME      = sprintf("%s.%s", 
                                      strlower(subobj.HOSTNAME), 
                                      subobj.DNSDOMAIN);
-       subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
        rdn_list = split(".", subobj.REALM);
-       subobj.RDN_DC       = rdn_list[0];
+       subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
        return subobj;
 }