diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-08-29 18:52:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:34:56 -0500 |
| commit | 11f3f0fa6cfb0486bdc526465dc4c0e19467a30f (patch) | |
| tree | 5afbcf0b284c5af9d158166c2b6b66c3e2700933 /source4/scripting/ejs | |
| parent | 615e1c55bfd0b5e5cb2ac77b19a0c395ef566bd2 (diff) | |
| download | samba-11f3f0fa6cfb0486bdc526465dc4c0e19467a30f.tar.gz samba-11f3f0fa6cfb0486bdc526465dc4c0e19467a30f.tar.bz2 samba-11f3f0fa6cfb0486bdc526465dc4c0e19467a30f.zip | |
r9754: Upgrading with the command line utility now works, at least partially (-:
Upgrading using SWAT should work as well now.
(This used to be commit 8baa2ac377315ae8b365f58c2bda0bf3d0c5aec3)
Diffstat (limited to 'source4/scripting/ejs')
| -rw-r--r-- | source4/scripting/ejs/smbcalls_samba3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c index 66e1299566..e6f6481060 100644 --- 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)); |