[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Thu Dec 27 11:20:03 MST 2012
The branch, master has been updated
via 2495752 lib/param: use the correct path names again
from 3e28c29 selftest/flapping: mark samba4.rpc.samr.large-dc.two as knownfail
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 24957527e0250a9a5d4c51ff47db9ff2eb11ee7b
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Dec 27 16:09:39 2012 +0100
lib/param: use the correct path names again
This fixes a regression which was introduced by commit
5b1d95046c8ea624419d94dd7d9e2785ba86f556.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Thu Dec 27 19:19:55 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/param/util.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/param/util.c b/lib/param/util.c
index 2569e7b..f488540 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);
}
/**
--
Samba Shared Repository
More information about the samba-cvs
mailing list