r7071: allow access to the current mpr memory context from ejs calls

(This used to be commit a58531dcf30b091913563ca2b8ce5e5843896441)

diff --git a/source4/lib/ejs/miniMpr.c b/source4/lib/ejs/miniMpr.c
index 2094052b3933b4afca98e0a73dee958e888ec29e..8b969289b02bc7fa90d9c6d81c3c4e4eba32b6e2 100644 (file)
--- a/source4/lib/ejs/miniMpr.c
+++ b/source4/lib/ejs/miniMpr.c
@@ -37,11 +37,18 @@
 
 static void *mpr_ctx;
 
+/* set the memory context to be used for all ejs variables */
 void mprSetCtx(TALLOC_CTX *ctx)
 {
        mpr_ctx = ctx;
 }
 
+/* return the memory context being used for all ejs variables */
+void *mprMemCtx(void)
+{
+       return mpr_ctx;
+}
+
 void mprFree(void *ptr)
 {
        talloc_free(ptr);

diff --git a/source4/lib/ejs/miniMpr.h b/source4/lib/ejs/miniMpr.h
index b34fb2e2930ec012a81db483e2225410c35ba0e5..b74c734728034134710b9c140aefce48c8f564c7 100644 (file)
--- a/source4/lib/ejs/miniMpr.h
+++ b/source4/lib/ejs/miniMpr.h
@@ -270,6 +270,7 @@ extern int          mprStrcpy(char *dest, int destMax, const char *src);
 extern int             mprMemcpy(char *dest, int destMax, const char *src, int nbytes);
 
 extern void mprSetCtx(void *ctx);
+extern void *mprMemCtx(void);
 
 #ifdef __cplusplus
 }