From 209d47c100bf59f15519c4c82089285210041c2e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 29 Apr 2011 12:41:45 +1000 Subject: s4-param Rename lock_path() -> lpcfg_lock_path() This avoids a conflict with the source3/ lock_path() --- source4/param/param.h | 2 +- source4/param/util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/param') diff --git a/source4/param/param.h b/source4/param/param.h index b8fb369bdb..c33d384500 100644 --- a/source4/param/param.h +++ b/source4/param/param.h @@ -274,7 +274,7 @@ bool lpcfg_is_myname(struct loadparm_context *lp_ctx, const char *name); /** A useful function for returning a path in the Samba lock directory. **/ -char *lock_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, +char *lpcfg_lock_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 3413f25e49..af46c09c07 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -75,7 +75,7 @@ bool lpcfg_is_myname(struct loadparm_context *lp_ctx, const char *name) /** A useful function for returning a path in the Samba lock directory. **/ -char *lock_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, +char *lpcfg_lock_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, const char *name) { char *fname, *dname; -- cgit