summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-28 02:38:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:34:52 -0500
commit9b0662bb4478ba6b8c75de1e7e5e272a0d14c2d6 (patch)
tree3548497821b4a72b11278d4974319dbbbca52e5d
parent8da7ab52ebcb6fb20aa87a19f5065d931cac853c (diff)
downloadsamba-9b0662bb4478ba6b8c75de1e7e5e272a0d14c2d6.tar.gz
samba-9b0662bb4478ba6b8c75de1e7e5e272a0d14c2d6.tar.bz2
samba-9b0662bb4478ba6b8c75de1e7e5e272a0d14c2d6.zip
r9707: r11080@blu: tridge | 2005-08-28 12:41:12 +1000
make sure we leave the account enabled after creating a new user (This used to be commit a22d0d02eed8b960f5fde4211b0d2967c500f4a4)
-rw-r--r--source4/scripting/libjs/provision.js27
1 files changed, 26 insertions, 1 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 0bcb2fa761..afa5adaa9f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -318,6 +318,28 @@ function searchone(ldb, expression, attribute)
}
/*
+ modify an account to remove the
+*/
+function enable_account(ldb, user_dn)
+{
+ var attrs = new Array("userAccountControl");
+ var res = ldb.search(NULL, user_dn, ldb.SCOPE_ONELEVEL, attrs);
+ assert(res.length == 1);
+ var userAccountControl = res[0].userAccountControl;
+ userAccountControl = userAccountControl - 2; /* remove disabled bit */
+ var mod = sprintf("
+dn: %s
+changetype: modify
+replace: userAccountControl
+userAccountControl: %u
+",
+ user_dn, userAccountControl);
+ var ok = ldb.modify(mod);
+ return ok;
+}
+
+
+/*
add a new user record
*/
function newuser(username, unixname, password, message)
@@ -385,7 +407,10 @@ member: %s
return false;
}
- return true;
+ /*
+ modify the userAccountControl to remove the disabled bit
+ */
+ return enable_account(ldb, user_dn);
}