summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-18 23:58:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:37 -0500
commit09fb6d2280187527898ae5af9c266c7474901dac (patch)
tree0596f22070826cf11e6e0be250c42940099db063 /source4/setup
parent0752efe05554de05eea1812a4dd721692ca8bf95 (diff)
downloadsamba-09fb6d2280187527898ae5af9c266c7474901dac.tar.gz
samba-09fb6d2280187527898ae5af9c266c7474901dac.tar.bz2
samba-09fb6d2280187527898ae5af9c266c7474901dac.zip
r8558: move newuser logic into the provision.js lib
(This used to be commit b6ef32ddd1fdca0d40a12f34fa5f7a484b3c2071)
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/newuser73
1 files changed, 2 insertions, 71 deletions
diff --git a/source4/setup/newuser b/source4/setup/newuser
index 5c426e3848..4471e70919 100755
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -21,8 +21,8 @@ if (ok == false) {
}
libinclude("base.js");
+libinclude("provision.js");
-var samdb = lpGet("sam database");
/*
print a message if quiet is not set
@@ -35,20 +35,6 @@ function message()
}
/*
- search for one attribute as a string
- */
-function search(db, expression, attribute)
-{
- var attrs = new Array(attribute);
- res = ldbSearch(db, expression, attrs);
- if (res.length != 1 ||
- res[0][attribute] == undefined) {
- return undefined;
- }
- return res[0][attribute];
-}
-
-/*
show some help
*/
function ShowHelp()
@@ -82,61 +68,6 @@ if (getpwnam(options.unixname) == undefined) {
exit(1);
}
-if (search(samdb, "name=" + options.username, "dn") != undefined) {
- printf("ERROR: User '%s' already exists\n", options.username);
- exit(1);
-}
-
-var domain_dn = search(samdb, "objectClass=domainDNS", "dn");
-assert(domain_dn != undefined);
-var dom_users = search(samdb, "name=Domain Users", "dn");
-assert(dom_users != undefined);
-
-var user_dn = sprintf("CN=%s,CN=Users,%s", options.username, domain_dn);
-
-/*
- the new user record. note the reliance on the samdb module to fill
- in a sid, guid etc
- */
-var ldif = sprintf("
-dn: %s
-sAMAccountName: %s
-name: %s
-memberOf: %s
-unixName: %s
-objectGUID: %s
-unicodePwd: %s
-objectClass: user
-",
- user_dn, options.username, options.username, dom_users,
- options.unixname, randguid(), options.password);
-
-/*
- add the user to the users group as well
-*/
-var modgroup = sprintf("
-dn: %s
-changetype: modify
-add: member
-member: %s
-", dom_users, user_dn);
-
-/*
- now the real work
- */
-message("Adding user %s\n", user_dn);
-ok = ldbAdd(samdb, ldif);
-if (ok != true) {
- message("Failed to add %s\n", user_dn);
- exit(1);
-}
-
-message("Modifying group %s\n", dom_users);
-ok = ldbModify(samdb, modgroup);
-if (ok != true) {
- message("Failed to modify %s\n", dom_users);
- exit(1);
-}
+newuser(options.username, options.unixname, options.password, message);
-message("All OK\n");
return 0;