sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-15 16:23:49 +03:00
Code Activity

r9770: Couple other bugfixes

Browse Source 
Update TODO-list
This commit is contained in:
Jelmer Vernooij
2005-08-30 00:41:02 +00:00
committed by Gerald (Jerry) Carter
parent 7f9efaceb6
commit d9541535e3
9 changed files with 79 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/scripting/libjs/provision.js
View File

@@ -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) {

14
source/scripting/libjs/upgrade.js
View File

@@ -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");