summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-05-29 12:41:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:13 -0500
commit09e00bbdc18741c20f2eeba83da742f056115789 (patch)
tree36ceff1b5a26074fa0e91eea521f522bf60a85b1 /source4
parentfe17411203ba3ee5f0a496b524f4afb658077643 (diff)
downloadsamba-09e00bbdc18741c20f2eeba83da742f056115789.tar.gz
samba-09e00bbdc18741c20f2eeba83da742f056115789.tar.bz2
samba-09e00bbdc18741c20f2eeba83da742f056115789.zip
r7078: - fix an uninitialised variable in smbscript
- fixed handle passing in the smb/ejs interface calls, so they can be called safely from esp (This used to be commit 45ea1b64413de577366939b2106f657f6c47b1bd)
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/ejs/smbcalls.c8
-rw-r--r--source4/scripting/ejs/smbscript.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 664bb74df3..e436fc78df 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -252,8 +252,8 @@ failed:
*/
void smb_setup_ejs_functions(void)
{
- ejsDefineStringCFunction(-1, "lpGet", ejs_lpGet, NULL, 0);
- ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, 0);
- ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, 0);
- ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, 0);
+ ejsDefineStringCFunction(-1, "lpGet", ejs_lpGet, NULL, MPR_VAR_SCRIPT_HANDLE);
+ ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, MPR_VAR_SCRIPT_HANDLE);
+ ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
+ ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, MPR_VAR_SCRIPT_HANDLE);
}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 3378885147..021dafa4ae 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -33,7 +33,7 @@ void ejs_exception(const char *reason)
int main(int argc, const char *argv[])
{
EjsId eid;
- EjsHandle handle;
+ EjsHandle handle = 0;
MprVar result;
char *emsg;
TALLOC_CTX *mem_ctx = talloc_new(NULL);