summaryrefslogtreecommitdiffstats
path: root/source/scripting/ejs
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-29 18:52:24 +0000
committerJelmer Vernooij <jelmer@samba.org>2005-08-29 18:52:24 +0000
commit4fbf7e5ccd145d5bdda9ff184aeca3b45228e657 (patch)
treecd34a2ab6c7e2a276b44b7442dada9e431d35abf /source/scripting/ejs
parenta7c11823dce0ea4e16cbdadd704bf9df03df31ab (diff)
downloadsamba-4fbf7e5ccd145d5bdda9ff184aeca3b45228e657.tar.gz
samba-4fbf7e5ccd145d5bdda9ff184aeca3b45228e657.tar.xz
samba-4fbf7e5ccd145d5bdda9ff184aeca3b45228e657.zip
r9754: Upgrading with the command line utility now works, at least partially (-:
Upgrading using SWAT should work as well now.
Diffstat (limited to 'source/scripting/ejs')
-rw-r--r--source/scripting/ejs/smbcalls_samba3.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/scripting/ejs/smbcalls_samba3.c b/source/scripting/ejs/smbcalls_samba3.c
index 66e1299566e..e6f64810603 100644
--- a/source/scripting/ejs/smbcalls_samba3.c
+++ b/source/scripting/ejs/smbcalls_samba3.c
@@ -210,6 +210,8 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
mprSetVar(&mpv, "ldappws", es);
+ es = mprObject("array");
+
for (i = 0; i < sec->domain_count; i++) {
mprAddArray(&es, i, mprDomainSecrets(&sec->domains[i]));
}
@@ -448,7 +450,7 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
mprAssert(samba3);
- mprSetThisPtr(eid, "samba3", samba3);
+ mprSetPtrChild(&mpv, "samba3", samba3);
mprSetVar(&mpv, "winsentries", mprWinsEntries(samba3));
mprSetVar(&mpv, "samaccounts", mprSamAccounts(samba3));
mprSetVar(&mpv, "shares", mprShares(samba3));