r9754: Upgrading with the command line utility now works, at least partially (-:

[sfrench/samba-autobuild/.git] / source4 / scripting / ejs / smbcalls_samba3.c

diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 66e1299566eed030616294dd73ac8e0efc8ca928..e6f6481060376b4166f2af42915883b616173ff3 100644 (file)
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/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));