From 67905b41a97fb7c0a7f4c7070e837f1fcb8bfbb4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 29 Apr 2011 12:47:11 +1000 Subject: [PATCH] s4-param Rename private_path() -> lpcfg_private_path() This is consistent with lock_path() Andrew Bartlett --- source4/dns_server/dlz_bind9.c | 2 +- source4/dsdb/dns/dns_update.c | 4 ++-- source4/ldap_server/ldap_server.c | 4 ++-- source4/lib/ldb-samba/ldb_wrap.c | 2 +- source4/param/loadparm.c | 10 +++++----- source4/param/param.h | 2 +- source4/param/pyparam.c | 2 +- source4/param/secrets.c | 2 +- source4/param/share_ldb.c | 2 +- source4/param/util.c | 4 ++-- source4/wrepl_server/wrepl_server.c | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c index 7dd06c1b2c8..4399e1cd1f9 100644 --- a/source4/dns_server/dlz_bind9.c +++ b/source4/dns_server/dlz_bind9.c @@ -525,7 +525,7 @@ _PUBLIC_ isc_result_t dlz_create(const char *dlzname, if (options.url == NULL) { options.url = talloc_asprintf(tmp_ctx, "ldapi://%s", - private_path(tmp_ctx, state->lp, "ldap_priv/ldapi")); + lpcfg_private_path(tmp_ctx, state->lp, "ldap_priv/ldapi")); if (options.url == NULL) { result = ISC_R_NOMEMORY; goto failed; diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c index ede730a8a94..603a218ef99 100644 --- a/source4/dsdb/dns/dns_update.c +++ b/source4/dsdb/dns/dns_update.c @@ -123,12 +123,12 @@ static void dnsupdate_rebuild(struct dnsupdate_service *service) path = lpcfg_parm_string(service->task->lp_ctx, NULL, "dnsupdate", "path"); if (path == NULL) { - path = private_path(tmp_ctx, service->task->lp_ctx, "named.conf.update"); + path = lpcfg_private_path(tmp_ctx, service->task->lp_ctx, "named.conf.update"); } path_static = lpcfg_parm_string(service->task->lp_ctx, NULL, "dnsupdate", "extra_static_grant_rules"); if (path_static == NULL) { - path_static = private_path(tmp_ctx, service->task->lp_ctx, "named.conf.update.static"); + path_static = lpcfg_private_path(tmp_ctx, service->task->lp_ctx, "named.conf.update.static"); } tmp_path = talloc_asprintf(tmp_ctx, "%s.tmp", path); diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index adcf7bc71d7..25dfadb40e6 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -969,7 +969,7 @@ static void ldapsrv_task_init(struct task_server *task) if (!NT_STATUS_IS_OK(status)) goto failed; } - ldapi_path = private_path(ldap_service, task->lp_ctx, "ldapi"); + ldapi_path = lpcfg_private_path(ldap_service, task->lp_ctx, "ldapi"); if (!ldapi_path) { goto failed; } @@ -986,7 +986,7 @@ static void ldapsrv_task_init(struct task_server *task) } #ifdef WITH_LDAPI_PRIV_SOCKET - priv_dir = private_path(ldap_service, task->lp_ctx, "ldap_priv"); + priv_dir = lpcfg_private_path(ldap_service, task->lp_ctx, "ldap_priv"); if (priv_dir == NULL) { goto failed; } diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c index 7dcf514e23b..6d92f60d621 100644 --- a/source4/lib/ldb-samba/ldb_wrap.c +++ b/source4/lib/ldb-samba/ldb_wrap.c @@ -209,7 +209,7 @@ int samba_ldb_connect(struct ldb_context *ldb, struct loadparm_context *lp_ctx, flags |= LDB_FLG_ENABLE_TRACING; } - real_url = private_path(ldb, lp_ctx, url); + real_url = lpcfg_private_path(ldb, lp_ctx, url); if (real_url == NULL) { return LDB_ERR_OPERATIONS_ERROR; } diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 95460c62356..7892e9e9b6d 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2830,27 +2830,27 @@ void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx, _PUBLIC_ char *lpcfg_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_keyfile); + return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_keyfile); } _PUBLIC_ char *lpcfg_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_certfile); + return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_certfile); } _PUBLIC_ char *lpcfg_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_cafile); + return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_cafile); } _PUBLIC_ char *lpcfg_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_crlfile); + return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_crlfile); } _PUBLIC_ char *lpcfg_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_dhpfile); + return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_dhpfile); } _PUBLIC_ struct dcerpc_server_info *lpcfg_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) diff --git a/source4/param/param.h b/source4/param/param.h index 0f843fbafac..084f12b723a 100644 --- a/source4/param/param.h +++ b/source4/param/param.h @@ -295,7 +295,7 @@ char *lpcfg_config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, * * @retval Pointer to a talloc'ed string containing the full path. **/ -char *private_path(TALLOC_CTX* mem_ctx, +char *lpcfg_private_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, const char *name); diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c index 3ba81468605..043d8261d47 100644 --- a/source4/param/pyparam.c +++ b/source4/param/pyparam.c @@ -229,7 +229,7 @@ static PyObject *py_lp_ctx_private_path(py_talloc_Object *self, PyObject *args) if (!PyArg_ParseTuple(args, "s", &name)) return NULL; - path = private_path(NULL, PyLoadparmContext_AsLoadparmContext(self), name); + path = lpcfg_private_path(NULL, PyLoadparmContext_AsLoadparmContext(self), name); ret = PyString_FromString(path); talloc_free(path); diff --git a/source4/param/secrets.c b/source4/param/secrets.c index 13bfcc5e96a..70690a5e3bc 100644 --- a/source4/param/secrets.c +++ b/source4/param/secrets.c @@ -57,7 +57,7 @@ struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_c uint8_t dummy; struct tdb_wrap *tdb; - fname = private_path(mem_ctx, lp_ctx, "secrets.tdb"); + fname = lpcfg_private_path(mem_ctx, lp_ctx, "secrets.tdb"); tdb = tdb_wrap_open(mem_ctx, fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); diff --git a/source4/param/share_ldb.c b/source4/param/share_ldb.c index c4ab319398c..f4d02b295a3 100644 --- a/source4/param/share_ldb.c +++ b/source4/param/share_ldb.c @@ -43,7 +43,7 @@ static NTSTATUS sldb_init(TALLOC_CTX *mem_ctx, const struct share_ops *ops, } sdb = ldb_wrap_connect(*ctx, ev_ctx, lp_ctx, - private_path(*ctx, lp_ctx, "share.ldb"), + lpcfg_private_path(*ctx, lp_ctx, "share.ldb"), system_session(lp_ctx), NULL, 0); diff --git a/source4/param/util.c b/source4/param/util.c index 8b44de5cf28..92bb8b3e17c 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -139,7 +139,7 @@ char *lpcfg_config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, * * @retval Pointer to a talloc'ed string containing the full path. **/ -char *private_path(TALLOC_CTX* mem_ctx, +char *lpcfg_private_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, const char *name) { @@ -165,7 +165,7 @@ char *smbd_tmp_path(TALLOC_CTX *mem_ctx, { char *fname, *dname; - dname = private_path(mem_ctx, lp_ctx, "smbd.tmp"); + dname = lpcfg_private_path(mem_ctx, lp_ctx, "smbd.tmp"); if (!directory_exist(dname)) { mkdir(dname,0755); } diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c index 83510c73a8e..e5317045d03 100644 --- a/source4/wrepl_server/wrepl_server.c +++ b/source4/wrepl_server/wrepl_server.c @@ -38,7 +38,7 @@ static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx) { - return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, private_path(mem_ctx, + return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, lpcfg_private_path(mem_ctx, lp_ctx, lpcfg_wins_config_url(lp_ctx)), system_session(lp_ctx), NULL, 0); } -- 2.11.4.GIT