2 files changed, 58 insertions, 29 deletions

diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 129cfe0898..703b8da2a7 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -42,29 +42,48 @@ function winreg_open_path(reg, path)
 	var list = new Object();
 
 	list.length = 0;
+
+	/* cope with a leading slash */
+	if (components[0] == '') {
+		for (i=0;i<(components.length-1);i++) {
+			components[i] = components[i+1];
+		}
+		components.length--;
+	}
 	
+	if (components.length == 0) {
+		return undefined;
+	}
+
 	var handle = winreg_open_hive(reg, components[0]);
 	if (handle == undefined) {
 		return undefined;
 	}
 
-	for (i=1;i<components.length;i++) {
-		io = irpcObj();
-		io.input.handle  = handle;
-		io.input.keyname = components[i];
-		io.input.unknown = 0;
-		io.input.access_mask = reg.SEC_FLAG_MAXIMUM_ALLOWED;
-		var status = reg.winreg_OpenKey(io);
-		if (!status.is_ok) {
-			return undefined;
-		}
-		if (io.output.result != "WERR_OK") {
-			return undefined;
-		}
+	if (components.length == 1) {
+		return handle;
+	}
 
-		handle = io.output.handle;
+	var hpath = components[1];
+
+	for (i=2;i<components.length;i++) {
+		hpath = hpath + "\\" + components[i];
 	}
-	return handle;
+
+	io = irpcObj();
+	io.input.handle  = handle;
+	io.input.keyname = hpath;
+	io.input.unknown = 0;
+	io.input.access_mask = reg.SEC_FLAG_MAXIMUM_ALLOWED;
+	var status = reg.winreg_OpenKey(io);
+	if (!status.is_ok) {
+		return undefined;
+	}
+	if (io.output.result != "WERR_OK") {
+		return undefined;
+	}
+	
+	return io.output.handle;
 }
 
 /*
@@ -76,6 +95,10 @@ function winreg_enum_path(reg, path)
 {
 	var list = new Object();
 	list.length = 0;
+
+	if (path == null || path == "\\" || path == "") {
+		return new Array("HKLM", "HKU");
+	}
 	
 	handle = winreg_open_path(reg, path);
 	if (handle == undefined) {
@@ -106,7 +129,6 @@ function winreg_enum_path(reg, path)
 		if (out.result != "WERR_OK") {
 			return list;
 		}
-
 		list[list.length] = out.out_name.name;
 		list.length++;
 	}
diff --git a/testprogs/ejs/winreg.js b/testprogs/ejs/winreg.js
index 831528b05c..22b20739f2 100755
--- a/testprogs/ejs/winreg.js
+++ b/testprogs/ejs/winreg.js
@@ -13,15 +13,15 @@ ok = GetOptions(ARGV, options,
 		"POPT_COMMON_SAMBA",
 		"POPT_COMMON_CREDENTIALS");
 if (ok == false) {
-   println("Failed to parse options: " + options.ERROR);
-   return -1;
+	println("Failed to parse options: " + options.ERROR);
+	return -1;
 }
 
 libinclude("base.js");
 
-if (options.ARGV.length != 1) {
-   println("Usage: winreg.js <BINDING>");
-   return -1;
+if (options.ARGV.length < 1) {
+	println("Usage: winreg.js <BINDING>");
+	return -1;
 }
 var binding = options.ARGV[0];
 reg = winreg_init();
@@ -30,8 +30,8 @@ security_init(reg);
 print("Connecting to " + binding + "\n");
 status = reg.connect(binding);
 if (status.is_ok != true) {
-   print("Failed to connect to " + binding + " - " + status.errstr + "\n");
-   return -1;
+	print("Failed to connect to " + binding + " - " + status.errstr + "\n");
+	return -1;
 }
 
 function list_path(path) {
@@ -41,18 +41,25 @@ function list_path(path) {
 		return;
 	}
 	for (i=0;i<list.length;i++) {
-		var npath = path + "\\" + list[i];
+		var npath;
+		if (path) {
+			npath = path + "\\" + list[i];
+		} else {
+			npath = list[i];
+		}
 		println(npath);
 		list_path(npath);
 	}
 }
 
-var trees = new Array("HKCR", "HKLM", "HKPD", "HKU");
+var root;
 
-for (i=0;i<trees.length;i++) {
-	printf("Listing tree '%s'\n", trees[i]);
-	list_path(trees[i]);
+if (options.ARGV.length > 1) {
+	root = options.ARGV[1];
+} else {
+	root = '';
 }
 
-print("All OK\n");
+printf("Listing registry tree '%s'\n", root);
+list_path(root);
 return 0;