r9834: More tests for the upgrade from Samba3

[samba.git] / source / scripting / ejs / smbcalls_samba3.c

diff --git a/source/scripting/ejs/smbcalls_samba3.c b/source/scripting/ejs/smbcalls_samba3.c
index 0d54d54dcc19547f06ae64a356887bd2c7cc4999..0e4743eca97e02adbc2bf892260e3d840d92bd73 100644 (file)
--- a/source/scripting/ejs/smbcalls_samba3.c
+++ b/source/scripting/ejs/smbcalls_samba3.c
@@ -55,6 +55,10 @@ static struct MprVar mprRegistry(struct samba3_regdb *reg)
                mprAddArray(&ks, i, k);
        }
 
                mprAddArray(&ks, i, k);
        }
 

+       if (i == 0) {
+               mprSetVar(&ks, "length", mprCreateIntegerVar(i));
+       }
+

        mprSetVar(&mpv, "keys", ks);
 
        return mpv;
        mprSetVar(&mpv, "keys", ks);
 
        return mpv;


@@ -104,6 +108,11 @@ static struct MprVar mprIdmapDb(struct samba3_idmapdb *db)
                mprAddArray(&mps, i, mp);
        }
 
                mprAddArray(&mps, i, mp);
        }
 

+       if (i == 0) {
+               mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+       }
+
+

        mprSetVar(&mpv, "mappings", mps);
 
        return mpv;
        mprSetVar(&mpv, "mappings", mps);
 
        return mpv;


@@ -131,6 +140,11 @@ static struct MprVar mprGroupMappings(struct samba3_groupdb *db)
                mprAddArray(&mpv, i, g);
        }
 
                mprAddArray(&mpv, i, g);
        }
 

+       if (i == 0) {
+               mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+       }
+
+

        return mpv;
 }
 
        return mpv;
 }
 


@@ -158,6 +172,10 @@ static struct MprVar mprAliases(struct samba3_groupdb *db)
                mprSetVar(&a, "members", am);
        }
 
                mprSetVar(&a, "members", am);
        }
 

+       if (i == 0) {
+               mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+       }
+

        return mpv;
 }
 
        return mpv;
 }
 


@@ -219,6 +237,10 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
                mprAddArray(&es, i, mprDomainSecrets(&sec->domains[i]));
        }
 
                mprAddArray(&es, i, mprDomainSecrets(&sec->domains[i]));
        }
 

+       if (i == 0) {
+               mprSetVar(&es, "length", mprCreateIntegerVar(i));
+       }
+

        mprSetVar(&mpv, "domains", es);
 
        es = mprObject("trusted_domains");
        mprSetVar(&mpv, "domains", es);
 
        es = mprObject("trusted_domains");


@@ -247,6 +269,10 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
                mprAddArray(&es, i, e);
        }
 
                mprAddArray(&es, i, e);
        }
 

+       if (i == 0) {
+               mprSetVar(&es, "length", mprCreateIntegerVar(i));
+       }
+

        mprSetVar(&mpv, "trusted_domains", es);
        
        es = mprObject("array");
        mprSetVar(&mpv, "trusted_domains", es);
        
        es = mprObject("array");


@@ -279,6 +305,10 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
                mprAddArray(&es, i, e);
        }
 
                mprAddArray(&es, i, e);
        }
 

+       if (i == 0) {
+               mprSetVar(&es, "length", mprCreateIntegerVar(i));
+       }
+

        mprSetVar(&mpv, "afs_keyfiles", es);
 
        mprSetVar(&mpv, "ipc_cred", mprCredentials(sec->ipc_cred));
        mprSetVar(&mpv, "afs_keyfiles", es);
 
        mprSetVar(&mpv, "ipc_cred", mprCredentials(sec->ipc_cred));


@@ -301,6 +331,10 @@ static struct MprVar mprShares(struct samba3 *samba3)
                mprAddArray(&mpv, i, s);
        }
 
                mprAddArray(&mpv, i, s);
        }
 

+       if (i == 0) {
+               mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+       }
+

        return mpv;
 }
 
        return mpv;
 }
 


@@ -348,6 +382,10 @@ static struct MprVar mprSamAccounts(struct samba3 *samba3)
                mprAddArray(&mpv, i, m);
        }
 
                mprAddArray(&mpv, i, m);
        }
 

+       if (i == 0) {
+               mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+       }
+

        return mpv;
 }
 
        return mpv;
 }
 


@@ -375,6 +413,10 @@ static struct MprVar mprWinsEntries(struct samba3 *samba3)
                mprAddArray(&mpv, i, w);
        }
 
                mprAddArray(&mpv, i, w);
        }
 

+       if (i == 0) {
+               mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+       }
+

        return mpv;
 }
 
        return mpv;
 }