s4-loadparm: 2nd half of lp_ to lpcfg_ conversion

[nivanova/samba-autobuild/.git] / source4 / param / pyparam_util.c

diff --git a/source4/param/pyparam_util.c b/source4/param/pyparam_util.c
index 8136746f52e3bcf67fcc0c3e54b18854472e5111..8c98cbcbfee44fa84eaf80d48d503984a1777187 100644 (file)
--- a/source4/param/pyparam_util.c
+++ b/source4/param/pyparam_util.c
@@ -25,13 +25,13 @@
 
 #define PyLoadparmContext_AsLoadparmContext(obj) py_talloc_get_type(obj, struct loadparm_context)
 
-_PUBLIC_ struct loadparm_context *lp_from_py_object(TALLOC_CTX *mem_ctx, PyObject *py_obj)
+_PUBLIC_ struct loadparm_context *lpcfg_from_py_object(TALLOC_CTX *mem_ctx, PyObject *py_obj)
 {
     struct loadparm_context *lp_ctx;
 
     if (PyString_Check(py_obj)) {
         lp_ctx = loadparm_init(mem_ctx);
-        if (!lp_load(lp_ctx, PyString_AsString(py_obj))) {
+        if (!lpcfg_load(lp_ctx, PyString_AsString(py_obj))) {
             talloc_free(lp_ctx);
                        PyErr_Format(PyExc_RuntimeError, "Unable to load %s", 
                                                 PyString_AsString(py_obj));
@@ -43,7 +43,7 @@ _PUBLIC_ struct loadparm_context *lp_from_py_object(TALLOC_CTX *mem_ctx, PyObjec
     if (py_obj == Py_None) {
         lp_ctx = loadparm_init(mem_ctx);
                /* We're not checking that loading the file succeeded *on purpose */
-        lp_load_default(lp_ctx);
+        lpcfg_load_default(lp_ctx);
         return lp_ctx;
     }
 
@@ -54,7 +54,7 @@ struct loadparm_context *py_default_loadparm_context(TALLOC_CTX *mem_ctx)
 {
     struct loadparm_context *ret;
     ret = loadparm_init(mem_ctx);
-    if (!lp_load_default(ret))
+    if (!lpcfg_load_default(ret))
         return NULL;
     return ret;
 }