summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-06 21:45:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:49 -0500
commit27f997e6825827ec99e1580370218c294d455e79 (patch)
tree4bf1d7f3f359beb5ee9f761ca3e0410824159fba
parent528470d4a74b1e2068fdc98b62076e8b19db47fc (diff)
downloadsamba-27f997e6825827ec99e1580370218c294d455e79.tar.gz
samba-27f997e6825827ec99e1580370218c294d455e79.tar.bz2
samba-27f997e6825827ec99e1580370218c294d455e79.zip
r12749: Fix the newuser script.
Andrew Bartlett (This used to be commit 42cdad5e3f06c307baf80396fd8449b803ef84c3)
-rw-r--r--source4/scripting/libjs/provision.js10
-rwxr-xr-xsource4/setup/newuser7
2 files changed, 10 insertions, 7 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 17382cc014..e71ea83523 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -406,7 +406,7 @@ userAccountControl: %u
/*
add a new user record
*/
-function newuser(username, unixname, password, message, subobj, session_info, credentials)
+function newuser(username, unixname, password, message, session_info, credentials)
{
var lp = loadparm_init();
var samdb = lp.get("sam database");
@@ -437,15 +437,13 @@ function newuser(username, unixname, password, message, subobj, session_info, cr
var ldif = sprintf("
dn: %s
sAMAccountName: %s
-name: %s
memberOf: %s
unixName: %s
-objectGUID: %s
-unicodePwd: %s
+sambaPassword: %s
objectClass: user
",
- user_dn, username, username, dom_users,
- unixname, randguid(), password);
+ user_dn, username, dom_users,
+ unixname, password);
/*
add the user to the users group as well
*/
diff --git a/source4/setup/newuser b/source4/setup/newuser
index c114338d27..4d2acf5373 100755
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -10,6 +10,7 @@ options = GetOptions(ARGV,
"POPT_AUTOHELP",
"POPT_COMMON_SAMBA",
"POPT_COMMON_VERSION",
+ "POPT_COMMON_CREDENTIALS",
'username=s',
'unixname=s',
'password=s',
@@ -70,6 +71,10 @@ if (nss.getpwnam(options.unixname) == undefined) {
exit(1);
}
-newuser(options.username, options.unixname, options.password, message);
+var creds = options.get_credentials();
+var system_session = system_session();
+
+
+newuser(options.username, options.unixname, options.password, message, system_session, creds);
return 0;