summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-17 12:27:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:33:27 -0500
commit4e3cacdaa83638b705c4fa6e79e8f17456c3e233 (patch)
tree480dc3ec66df8deaf049fc600131fcb7ef43adf2
parent212af7e08ae655bdb36bb77dced8161dcfe09240 (diff)
downloadsamba-4e3cacdaa83638b705c4fa6e79e8f17456c3e233.tar.gz
samba-4e3cacdaa83638b705c4fa6e79e8f17456c3e233.tar.bz2
samba-4e3cacdaa83638b705c4fa6e79e8f17456c3e233.zip
r9355: return the EnumKey and EnumValue list we have so far when we get a rpc fault
(This used to be commit 3a9c63923fbb21dfb8e5fc549dde8fad8cb8f354)
-rw-r--r--source4/scripting/libjs/winreg.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 5323e91ae5..8befd36045 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -138,7 +138,7 @@ function winreg_enum_path(reg, path)
var status = reg.winreg_EnumKey(io);
if (!status.is_ok) {
winreg_close(reg, handle);
- return;
+ return list;
}
var out = io.output;
if (out.result == "WERR_MORE_DATA") {
@@ -146,7 +146,7 @@ function winreg_enum_path(reg, path)
idx--;
if (io.input.name.size > 32000) {
winreg_close(reg, handle);
- return undefined;
+ return list;
}
continue;
}
@@ -198,7 +198,7 @@ function winreg_enum_values(reg, path)
var status = reg.winreg_EnumValue(io);
if (!status.is_ok) {
winreg_close(reg, handle);
- return;
+ return list;
}
var out = io.output;
if (out.result == "WERR_MORE_DATA") {
@@ -208,7 +208,7 @@ function winreg_enum_values(reg, path)
/* limit blobs to 1M */
if (io.input.size > 1000000) {
winreg_close(reg, handle);
- return undefined;
+ return list;
}
continue;
}