summaryrefslogtreecommitdiff
path: root/testprogs/ejs
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-13 03:39:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:50:59 -0500
commit58f78fa182c4b4a046b957c89988d34ea2125696 (patch)
tree095fc563234da507b8f366ba98a0eeb0781e339b /testprogs/ejs
parent792951a36535c9345e6027e0940d97d511282302 (diff)
downloadsamba-58f78fa182c4b4a046b957c89988d34ea2125696.tar.gz
samba-58f78fa182c4b4a046b957c89988d34ea2125696.tar.bz2
samba-58f78fa182c4b4a046b957c89988d34ea2125696.zip
r12892: Add a 'Migrate from Windows' page to our installation section in SWAT.
Doing this required reworking ejsnet, particularly so it could take a set of credentials, not just a username and password argument. This required fixing the ejsnet.js test script, which now adds and deletes a user, and is run from 'make test'. This should prevent it being broken again. Deleting a user from ejsnet required that the matching backend be added to libnet, hooking fortunetly onto already existing code for the actual deletion. The js credentials interface now handles the 'set machine account' flag. New functions have been added to provision.js to wrap the basic operations (so we can write a command line version, as well as the web based version). Andrew Bartlett (This used to be commit a5e7c17c348c45e61699cc1626a0d5eae2df4636)
Diffstat (limited to 'testprogs/ejs')
-rwxr-xr-xtestprogs/ejs/ejsnet.js33
1 files changed, 28 insertions, 5 deletions
diff --git a/testprogs/ejs/ejsnet.js b/testprogs/ejs/ejsnet.js
index 537312766a..f1d84ffde0 100755
--- a/testprogs/ejs/ejsnet.js
+++ b/testprogs/ejs/ejsnet.js
@@ -1,15 +1,38 @@
#!/usr/bin/env smbscript
-var ctx = NetContext("Administrator", "admin");
-var usr_ctx = ctx.UserMgr("BUILTIN");
+var options = GetOptions(ARGV,
+ "POPT_AUTOHELP",
+ "POPT_COMMON_SAMBA",
+ "POPT_COMMON_CREDENTIALS");
+if (options == undefined) {
+ println("Failed to parse options");
+ return -1;
+}
+
+if (options.ARGV.length != 2) {
+ println("Usage: ejsnet.js <DOMAIN> <NEW USER NAME>");
+ return -1;
+}
+
+/* use command line creds if available */
+var creds = options.get_credentials();
+
+var ctx = NetContext(creds);
+var usr_ctx = ctx.UserMgr(options.ARGV[0]);
if (usr_ctx == undefined) {
- print("Couln't get user management context.\n");
+ println("Couln't get user management context.");
+ return -1;
+}
+
+var status = usr_ctx.Create(options.ARGV[1]);
+if (status.is_ok != true) {
+ println("Failed to create user account " + options.ARGV[1] + ": " + status.errstr);
return -1;
}
-var status = usr_ctx.Create("noname");
+var status = usr_ctx.Delete(options.ARGV[1]);
if (status.is_ok != true) {
- print("Failed to create user account: " + status.errstr + "\n");
+ println("Failed to delete user account " + options.ARGV[1] + ": " + status.errstr);
return -1;
}