diff options
| -rw-r--r-- | source4/scripting/libjs/provision.js | 10 | ||||
| -rwxr-xr-x | source4/setup/newuser | 7 |
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; |