From 24957527e0250a9a5d4c51ff47db9ff2eb11ee7b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 27 Dec 2012 16:09:39 +0100 Subject: [PATCH] lib/param: use the correct path names again This fixes a regression which was introduced by commit 5b1d95046c8ea624419d94dd7d9e2785ba86f556. Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Thu Dec 27 19:19:55 CET 2012 on sn-devel-104 --- lib/param/util.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/param/util.c b/lib/param/util.c index 2569e7b89bf..f488540b7fa 100644 --- a/lib/param/util.c +++ b/lib/param/util.c @@ -72,7 +72,7 @@ bool lpcfg_is_myname(struct loadparm_context *lp_ctx, const char *name) } static char *lpcfg_common_path(TALLOC_CTX* mem_ctx, - struct loadparm_context *lp_ctx, + const char *parent, const char *name) { char *fname, *dname; @@ -85,7 +85,7 @@ static char *lpcfg_common_path(TALLOC_CTX* mem_ctx, return talloc_strdup(mem_ctx, name); } - dname = talloc_strdup(mem_ctx, lpcfg_lockdir(lp_ctx)); + dname = talloc_strdup(mem_ctx, parent); if (dname == NULL) { return NULL; } @@ -114,7 +114,7 @@ static char *lpcfg_common_path(TALLOC_CTX* mem_ctx, char *lpcfg_lock_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, const char *name) { - return lpcfg_common_path(mem_ctx, lp_ctx, name); + return lpcfg_common_path(mem_ctx, lpcfg_lockdir(lp_ctx), name); } /** @@ -123,7 +123,7 @@ char *lpcfg_lock_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, char *lpcfg_state_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, const char *name) { - return lpcfg_common_path(mem_ctx, lp_ctx, name); + return lpcfg_common_path(mem_ctx, lpcfg_statedir(lp_ctx), name); } /** @@ -132,7 +132,7 @@ char *lpcfg_state_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, char *lpcfg_cache_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, const char *name) { - return lpcfg_common_path(mem_ctx, lp_ctx, name); + return lpcfg_common_path(mem_ctx, lpcfg_cachedir(lp_ctx), name); } /** -- 2.11.4.GIT