s4-param Remove config_path() -> lpcfg_config_path()
authorAndrew Bartlett <abartlet@samba.org>
Fri, 29 Apr 2011 02:46:10 +0000 (12:46 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 29 Apr 2011 06:38:14 +0000 (16:38 +1000)
This is consistent with lock_path()

Andrew Bartlett

source4/auth/kerberos/krb5_init_context.c
source4/param/param.h
source4/param/util.c

index db3a5375c9220aca7f124f854c44f8d03e85bc72..fbcaad29d96981f7e69bdf1bd712bad592c08501 100644 (file)
@@ -415,7 +415,7 @@ smb_krb5_init_context_basic(TALLOC_CTX *tmp_ctx,
                return ret;
        }
 
                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;
        if (!config_file) {
                krb5_free_context(krb5_ctx);
                return ENOMEM;
index c33d38450049bc77f05f7e785e4245e4228dc7fe..0f843fbafaca056da89a934479546238751762f4 100644 (file)
@@ -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.
  **/
  *
  * @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);
 
 /**
                           const char *name);
 
 /**
index af46c09c07eb7c10eecc90643c65c8a6b8ebdbf0..8b44de5cf28025eb1bbc4e483ddb8f256be17407 100644 (file)
@@ -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.
  **/
 
  * @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;
                           const char *name)
 {
        char *fname, *config_dir, *p;