r12704: role => server role

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

diff --git a/source/scripting/libjs/upgrade.js b/source/scripting/libjs/upgrade.js
index 60a9725b43cf0a4cae9e52fdae6c9e47b47d0817..158e22eadd6500abd549600522c3c10f4d9fd18a 100644 (file)
--- a/source/scripting/libjs/upgrade.js
+++ b/source/scripting/libjs/upgrade.js
@@ -113,6 +113,10 @@ function upgrade_sam_account(ldb,acc,domaindn,domainsid)
 
        var pts = split(',', acc.fullname);
        acc.fullname = pts[0];
+
+       if (acc.fullname == undefined) {
+               acc.fullname = acc.username;
+       }
        
        assert(acc.fullname != undefined);
        assert(acc.nt_username != undefined);
@@ -147,7 +151,7 @@ objectSid: %s-%d
 lmPwdHash:: %s
 ntPwdHash:: %s
 
-", acc.fullname, domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
+", ldb.dn_escape(acc.fullname), domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
 
 acc.fullname, acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
 acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
@@ -495,15 +499,15 @@ function upgrade_smbconf(oldconf,mark)
 
        if (oldconf.get("domain logons") == "True") {
                if (oldconf.get("domain master") == "True") {
-                       newconf.set("role", "pdc");
+                       newconf.set("server role", "pdc");
                } else {
-                       newconf.set("role", "bdc");
+                       newconf.set("server role", "bdc");
                }
        } else {
                if (oldconf.get("domain master") == "True") {
-                       newconf.set("role", "standalone");
+                       newconf.set("server role", "standalone");
                } else {
-                       newconf.set("role", "member server");
+                       newconf.set("server role", "member server");
                }
        }
 
@@ -601,8 +605,10 @@ data: %d
        var pdb = samba3.configuration.get_list("passdb backend");
        if (pdb != undefined) {
                for (var b in pdb) {
-                       if (substr(pdb[b], 0, 7) == "ldapsam") {
-                               ldapurl = substr(pdb[b], 8);
+                       if (strlen(pdb[b]) >= 7) {
+                               if (substr(pdb[b], 0, 7) == "ldapsam") {
+                                       ldapurl = substr(pdb[b], 8);
+                               }
                        }
                }
        }