summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-29 12:46:10 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-29 16:38:14 +1000
commitdbbc6e9ddac30de869d67410869dba90b4bd4a19 (patch)
treef422290b0e9e44a769da389b8d23f446aecbee20 /source4
parent209d47c100bf59f15519c4c82089285210041c2e (diff)
downloadsamba-dbbc6e9ddac30de869d67410869dba90b4bd4a19.tar.gz
samba-dbbc6e9ddac30de869d67410869dba90b4bd4a19.tar.bz2
samba-dbbc6e9ddac30de869d67410869dba90b4bd4a19.zip
s4-param Remove config_path() -> lpcfg_config_path()
This is consistent with lock_path() Andrew Bartlett
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/kerberos/krb5_init_context.c2
-rw-r--r--source4/param/param.h2
-rw-r--r--source4/param/util.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index db3a5375c9..fbcaad29d9 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -415,7 +415,7 @@ smb_krb5_init_context_basic(TALLOC_CTX *tmp_ctx,
return ret;
}
- config_file = config_path(tmp_ctx, lp_ctx, "krb5.conf");
+ config_file = lpcfg_config_path(tmp_ctx, lp_ctx, "krb5.conf");
if (!config_file) {
krb5_free_context(krb5_ctx);
return ENOMEM;
diff --git a/source4/param/param.h b/source4/param/param.h
index c33d384500..0f843fbafa 100644
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -284,7 +284,7 @@ char *lpcfg_lock_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
*
* @retval Pointer to a talloc'ed string containing the full path.
**/
-char *config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
+char *lpcfg_config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
const char *name);
/**
diff --git a/source4/param/util.c b/source4/param/util.c
index af46c09c07..8b44de5cf2 100644
--- a/source4/param/util.c
+++ b/source4/param/util.c
@@ -108,7 +108,7 @@ char *lpcfg_lock_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
* @retval Pointer to a talloc'ed string containing the full path.
**/
-char *config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
+char *lpcfg_config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
const char *name)
{
char *fname, *config_dir, *p;