From 6b266b85cf34145ac1f03d8f787b81121e4ec92b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 16 Jul 2010 14:32:42 +1000 Subject: s4-loadparm: 2nd half of lp_ to lpcfg_ conversion this converts all callers that use the Samba4 loadparm lp_ calling convention to use the lpcfg_ prefix. Signed-off-by: Andrew Bartlett --- source4/lib/ldb-samba/ldb_wrap.c | 8 ++++---- source4/lib/ldb-samba/pyldb.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/lib/ldb-samba') diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c index 80256c9a94..365b67b6af 100644 --- a/source4/lib/ldb-samba/ldb_wrap.c +++ b/source4/lib/ldb-samba/ldb_wrap.c @@ -166,7 +166,7 @@ static int ldb_wrap_destructor(struct ldb_wrap *w) ldb_set_modules_dir(ldb, talloc_asprintf(ldb, "%s/ldb", - lp_modulesdir(lp_ctx))); + lpcfg_modulesdir(lp_ctx))); if (session_info) { if (ldb_set_opaque(ldb, "sessionInfo", session_info)) { @@ -197,7 +197,7 @@ static int ldb_wrap_destructor(struct ldb_wrap *w) return NULL; } - if (lp_ctx != NULL && strcmp(lp_sam_url(lp_ctx), url) == 0) { + if (lp_ctx != NULL && strcmp(lpcfg_sam_url(lp_ctx), url) == 0) { dsdb_set_global_schema(ldb); } @@ -212,7 +212,7 @@ static int ldb_wrap_destructor(struct ldb_wrap *w) } /* allow admins to force non-sync ldb for all databases */ - if (lp_parm_bool(lp_ctx, NULL, "ldb", "nosync", false)) { + if (lpcfg_parm_bool(lp_ctx, NULL, "ldb", "nosync", false)) { flags |= LDB_FLG_NOSYNC; } @@ -253,7 +253,7 @@ static int ldb_wrap_destructor(struct ldb_wrap *w) DLIST_ADD(ldb_wrap_list, w); /* make the resulting schema global */ - if (lp_ctx != NULL && strcmp(lp_sam_url(lp_ctx), url) == 0) { + if (lp_ctx != NULL && strcmp(lpcfg_sam_url(lp_ctx), url) == 0) { struct dsdb_schema *schema = dsdb_get_schema(ldb, NULL); if (schema) { dsdb_make_schema_global(ldb, schema); diff --git a/source4/lib/ldb-samba/pyldb.c b/source4/lib/ldb-samba/pyldb.c index 2b7b23739e..e8cdb90b9f 100644 --- a/source4/lib/ldb-samba/pyldb.c +++ b/source4/lib/ldb-samba/pyldb.c @@ -56,7 +56,7 @@ static PyObject *py_ldb_set_loadparm(PyObject *self, PyObject *args) ldb = PyLdb_AsLdbContext(self); - lp_ctx = lp_from_py_object(ldb, py_lp_ctx); + lp_ctx = lpcfg_from_py_object(ldb, py_lp_ctx); if (lp_ctx == NULL) { PyErr_SetString(PyExc_TypeError, "Expected loadparm object"); return NULL; -- cgit