diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 12:41:45 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 16:38:14 +1000 |
| commit | 209d47c100bf59f15519c4c82089285210041c2e (patch) | |
| tree | efd9d65fe36a8c34b034800de32085290bb0be33 /source4/param | |
| parent | 6021af4fd38d2a712dca42a3cacf8537007fd160 (diff) | |
| download | samba-209d47c100bf59f15519c4c82089285210041c2e.tar.gz samba-209d47c100bf59f15519c4c82089285210041c2e.tar.bz2 samba-209d47c100bf59f15519c4c82089285210041c2e.zip | |
s4-param Rename lock_path() -> lpcfg_lock_path()
This avoids a conflict with the source3/ lock_path()
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/param.h | 2 | ||||
| -rw-r--r-- | source4/param/util.c | 2 |
2 files changed, 2 insertions, 2 deletions
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; |