diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-08-30 00:41:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:34:58 -0500 |
| commit | 7be4cf8c1ded42daf7e86ecd2c0dbfeeed312b22 (patch) | |
| tree | 31b40e747ae679f4d6eeef2f8b3999070c747ea6 /source4/scripting/libjs | |
| parent | 37194224416d7509a457ee4aa18991b8bab0da7d (diff) | |
| download | samba-7be4cf8c1ded42daf7e86ecd2c0dbfeeed312b22.tar.gz samba-7be4cf8c1ded42daf7e86ecd2c0dbfeeed312b22.tar.bz2 samba-7be4cf8c1ded42daf7e86ecd2c0dbfeeed312b22.zip | |
r9770: Couple other bugfixes
Update TODO-list
(This used to be commit d9541535e3f9e1c058410eeb0a54d60181572f2b)
Diffstat (limited to 'source4/scripting/libjs')
| -rw-r--r-- | source4/scripting/libjs/provision.js | 3 | ||||
| -rw-r--r-- | source4/scripting/libjs/upgrade.js | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index b43d435ca9..9607d6f274 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -164,14 +164,13 @@ function setup_ldb(ldif, dbname, subobj) erase = arguments[4]; } - var dbfile = dbname; var src = lp.get("setup directory") + "/" + ldif; var data = sys.file_load(src); data = data + extra; data = substitute_var(data, subobj); - var ok = ldb.connect(dbfile); + var ok = ldb.connect(dbname); assert(ok); if (erase) { diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js index dbf1c0f2c3..c78afd6a91 100644 --- a/source4/scripting/libjs/upgrade.js +++ b/source4/scripting/libjs/upgrade.js @@ -116,8 +116,6 @@ description: %s primaryGroupID: %d badPwdcount: %d logonCount: %d -ntPwdHash:: %s -lmPwdHash:: %s samba3Domain: %s samba3DirDrive: %s samba3MungedDial: %s @@ -131,6 +129,8 @@ samba3PassLastSetTime: %d samba3PassCanChangeTime: %d samba3PassMustChangeTime: %d samba3Rid: %d +ntPwdHash:: %s +lmPwdHash:: %s ", acc.fullname, domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.fullname, acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count, @@ -422,18 +422,20 @@ dn: @MAP=samba3sam message("Importing users\n"); for (var i in samba3.samaccounts) { - message("... " + samba3.samaccounts[i].username + "\n"); + message("... " + samba3.samaccounts[i].username); var ldif = upgrade_sam_account(samba3.samaccounts[i],subobj.BASEDN); ok = samdb.add(ldif); - assert(ok); + if (!ok) { message("... error!"); } + message("\n"); } message("Importing groups\n"); for (var i in samba3.groupmappings) { - message("... " + samba3.groupmappings[i].nt_name + "\n"); + message("... " + samba3.groupmappings[i].nt_name); var ldif = upgrade_sam_group(samba3.groupmappings[i],subobj.BASEDN); ok = samdb.add(ldif); - assert(ok); + if (!ok) { message("... error!"); } + message("\n"); } message("Importing registry data\n"); |