r12746: An initial version of the kludge_acls module.

[kamenim/samba.git] / source4 / scripting / ejs / smbcalls_ldb.c

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 798747b36c847834fbb4547f9a989ea1dbb55107..39698947d7be59905fac8c53e7e6da27aa47d8e8 100644 (file)
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -385,9 +385,9 @@ static int ejs_ldbModify(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 {
        struct ldb_context *ldb;
-       struct auth_session_info *session_info;
+       struct auth_session_info *session_info = NULL;
        struct cli_credentials *creds = NULL;
-       struct MprVar *credentials;
+       struct MprVar *credentials, *session;
        struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
        const char *dbfile;
@@ -397,13 +397,16 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
                return -1;
        }
 
-       session_info = mprGetThisPtr(eid, "session_info");
-
        credentials = mprGetProperty(this, "credentials", NULL);
        if (credentials) {
                creds = mprGetPtr(credentials, "creds");
        }
 
+       session = mprGetProperty(this, "session_info", NULL);
+       if (session) {
+               session_info = mprGetPtr(session, "session_info");
+       }
+
        dbfile = argv[0];
 
        ldb = ldb_wrap_connect(mprMemCtx(), dbfile,