r8558: move newuser logic into the provision.js lib

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index bf39bcb992d097ffbbb78526f7a3e9697bf072c9..c7fb1b5fc5188be874988f10795e06fedf212bee 100644 (file)
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -226,4 +226,88 @@ function provision_guess()
        return subobj;
 }
 
        return subobj;
 }
 

+/*
+  search for one attribute as a string
+ */
+function searchone(ldb, expression, attribute)
+{
+       var attrs = new Array(attribute);
+       res = ldb.search(expression, attrs);
+       if (res.length != 1 ||
+           res[0][attribute] == undefined) {
+               return undefined;
+       }
+       return res[0][attribute];
+}
+
+/*
+  add a new user record
+*/
+function newuser(username, unixname, password, message)
+{
+       var samdb = lpGet("sam database");
+       var ldb = ldb_init();
+
+       /* connect to the sam */
+       var ok = ldb.connect(samdb);
+       assert(ok);
+
+       /* find the DNs for the domain and the domain users group */
+       var domain_dn = searchone(ldb, "objectClass=domainDNS", "dn");
+       assert(domain_dn != undefined);
+       var dom_users = searchone(ldb, "name=Domain Users", "dn");
+       assert(dom_users != undefined);
+
+       var user_dn = sprintf("CN=%s,CN=Users,%s", 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, username, username, dom_users,
+                          unixname, randguid(), 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 = ldb.add(ldif);
+       if (ok != true) {
+               message("Failed to add %s - %s\n", user_dn, ldb.errstring());
+               return false;
+       }
+
+       message("Modifying group %s\n", dom_users);
+       ok = ldb.modify(modgroup);
+       if (ok != true) {
+               message("Failed to modify %s - %s\n", dom_users, ldb.errstring());
+               return false;
+       }
+
+       return true;
+}
+
+

 return 0;
 return 0;

diff --git a/source/setup/newuser b/source/setup/newuser
index 5c426e384889caaad7f6a327e931a565c6620c0b..4471e70919a84c14785acdf9265aa70e3b513b2e 100755 (executable)
--- a/source/setup/newuser
+++ b/source/setup/newuser
@@ -21,8 +21,8 @@ if (ok == false) {
 }
 
 libinclude("base.js");
 }
 
 libinclude("base.js");

+libinclude("provision.js");

 
 

-var samdb = lpGet("sam database");

 
 /*
   print a message if quiet is not set
 
 /*
   print a message if quiet is not set


@@ -34,20 +34,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
 */
 /*
  show some help
 */


@@ -82,61 +68,6 @@ if (getpwnam(options.unixname) == undefined) {
        exit(1);
 }
 
        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;
 return 0;