1 files changed, 15 insertions, 8 deletions
diff --git a/testprogs/ejs/samr.js b/testprogs/ejs/samr.js
index 1c613d5619..d0c2990158 100755
--- a/testprogs/ejs/samr.js
+++ b/testprogs/ejs/samr.js
@@ -3,9 +3,19 @@
   test samr calls from ejs
 */	
 
+var options = new Object();
+
+ok = GetOptions(ARGV, options,
+		"POPT_AUTOHELP",
+		"POPT_COMMON_SAMBA",
+		"POPT_COMMON_CREDENTIALS");
+if (ok == false) {
+   println("Failed to parse options: " + options.ERROR);
+   return -1;
+}
+
 libinclude("base.js");
 libinclude("samr.js");
-libinclude("samr.js");
 
 
 /*
@@ -96,14 +106,11 @@ function test_EnumDomains(conn, handle)
 	}
 }
 
-
-
-if (ARGV.length == 0) {
-   print("Usage: samr.js <RPCBINDING>\n");
-   exit(0);
+if (options.ARGV.length != 1) {
+   println("Usage: samr.js <BINDING>");
+   return -1;
 }
-
-var binding = ARGV[0];
+var binding = options.ARGV[0];
 var conn = new Object();
 
 print("Connecting to " + binding + "\n");