Introduce mprLpCtx() similar to mprMemCtx() for loadparm_context used by

[jelmer/samba4-debian.git] / source / scripting / ejs / smbcalls_config.c

diff --git a/source/scripting/ejs/smbcalls_config.c b/source/scripting/ejs/smbcalls_config.c
index b31b70bda8b551c323f7559322d00cd6c93b2ae1..eb673b3a2380452bacf306a7b4da9608426a1490 100644 (file)
--- a/source/scripting/ejs/smbcalls_config.c
+++ b/source/scripting/ejs/smbcalls_config.c
@@ -36,8 +36,8 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
        const char **list = NULL;
        if (argc != 0) return -1;
        
-       for (i=0;i<lp_numservices();i++) {
-               list = str_list_add(list, lp_servicename(i));
+       for (i=0;i<lp_numservices(mprLpCtx());i++) {
+               list = str_list_add(list, lp_servicename(lp_servicebynum(mprLpCtx(), i)));
        }
        talloc_steal(mprMemCtx(), list);
        mpr_Return(eid, mprList("services", list));
@@ -45,27 +45,6 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
 }
 
 
-/*
-  return a list of parameter categories
-*/
-static int ejs_lpCategories(MprVarHandle eid, int argc, char **argv)
-{
-       struct parm_struct *parm_table = lp_parm_table();
-       int i;
-       const char **list = NULL;
-       if (argc != 0) return -1;
-       
-       for (i=0;parm_table[i].label;i++) {
-               if (parm_table[i].class == P_SEPARATOR) {
-                       list = str_list_add(list, parm_table[i].label);
-               }
-       }
-       talloc_steal(mprMemCtx(), list);
-       mpr_Return(eid, mprList("categories", list));
-       return 0;
-}
-
-
 /*
   allow access to loadparm variables from inside ejs scripts in web apps
   
@@ -87,9 +66,10 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
        if (argc < 1) return -1;
 
        if (argc == 2) {
+               struct loadparm_service *service;
                /* its a share parameter */
-               int snum = lp_servicenumber(argv[0]);
-               if (snum == -1) {
+               service = lp_service(mprLpCtx(), argv[0]);
+               if (service == NULL) {
                        mpr_Return(eid, mprCreateUndefinedVar());
                        return 0;
                }
@@ -104,7 +84,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
                                mpr_Return(eid, mprCreateUndefinedVar());
                                return 0;
                        }
-                       value = lp_get_parametric(snum, type, option);
+                       value = lp_get_parametric(mprLpCtx(), service, type, option);
                        if (value == NULL) {
                                mpr_Return(eid, mprCreateUndefinedVar());
                                return 0;
@@ -118,7 +98,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
                        mpr_Return(eid, mprCreateUndefinedVar());
                        return 0;
                }
-               parm_ptr = lp_parm_ptr(snum, parm);
+               parm_ptr = lp_parm_ptr(mprLpCtx(), service, parm);
        } else if (strchr(argv[0], ':')) {
                /* its a global parametric option */
                const char *type = talloc_strndup(mprMemCtx(), 
@@ -129,7 +109,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
                        mpr_Return(eid, mprCreateUndefinedVar());
                        return 0;
                }
-               value = lp_get_parametric(-1, type, option);
+               value = lp_get_parametric(mprLpCtx(), NULL, type, option);
                if (value == NULL) {
                        mpr_Return(eid, mprCreateUndefinedVar());
                        return 0;
@@ -143,7 +123,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
                        mpr_Return(eid, mprCreateUndefinedVar());
                        return 0;
                }
-               parm_ptr = lp_parm_ptr(-1, parm);
+               parm_ptr = lp_parm_ptr(mprLpCtx(), NULL, parm);
        }
 
        if (parm == NULL || parm_ptr == NULL) {
@@ -158,7 +138,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
                mpr_ReturnString(eid, *(char **)parm_ptr);
                break;
        case P_BOOL:
-               mpr_Return(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
+               mpr_Return(eid, mprCreateBoolVar(*(bool *)parm_ptr));
                break;
        case P_INTEGER:
        case P_OCTAL:
@@ -177,13 +157,18 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
        case P_LIST: 
                mpr_Return(eid, mprList(parm->label, *(const char ***)parm_ptr));
                break;
-       case P_SEP:
-               mpr_Return(eid, mprCreateUndefinedVar());
-               return 0;
        }
        return 0;
 }
 
+/*
+    v = lp.filename();         obtain filename
+*/
+static int ejs_lpFilename(MprVarHandle eid, int argc, char **argv)
+{
+       mpr_ReturnString(eid, lp_configfile(mprLpCtx()));
+       return 0;
+}
 
 /*
   set a smb.conf parameter. Only sets in memory, not permanent
@@ -199,7 +184,7 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
                return -1;
        }
 
-       mpr_Return(eid, mprCreateBoolVar(lp_set_cmdline(argv[0], argv[1])));
+       mpr_Return(eid, mprCreateBoolVar(lp_set_cmdline(mprLpCtx(), argv[0], argv[1])));
        return 0;
 }
 
@@ -210,10 +195,10 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
-       BOOL ret = lp_load();
-       if (ret) {
-               unload_interfaces();
-       }
+       bool ret;
+       const char *filename = lp_configfile(mprLpCtx());
+
+       ret = lp_load(mprLpCtx(), filename);
        mpr_Return(eid, mprCreateBoolVar(ret));
        return 0;
 }
@@ -229,7 +214,7 @@ static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv)
        mprSetStringCFunction(obj, "set", ejs_lpSet);
        mprSetStringCFunction(obj, "reload", ejs_lpReload);
        mprSetStringCFunction(obj, "services", ejs_lpServices);
-       mprSetStringCFunction(obj, "categories", ejs_lpCategories);
+       mprSetStringCFunction(obj, "filename", ejs_lpFilename);
        return 0;
 }