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 | |
| 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()
| -rw-r--r-- | source4/nbt_server/wins/winsdb.c | 4 | ||||
| -rw-r--r-- | source4/param/param.h | 2 | ||||
| -rw-r--r-- | source4/param/util.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb/negprot.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c index 791ce957c7..4a1486092b 100644 --- a/source4/nbt_server/wins/winsdb.c +++ b/source4/nbt_server/wins/winsdb.c @@ -975,7 +975,7 @@ static bool winsdb_check_or_add_module_list(struct tevent_context *ev_ctx, flags |= LDB_FLG_NOSYNC; } - h->ldb = ldb_wrap_connect(h, ev_ctx, lp_ctx, lock_path(h, lp_ctx, lpcfg_wins_url(lp_ctx)), + h->ldb = ldb_wrap_connect(h, ev_ctx, lp_ctx, lpcfg_lock_path(h, lp_ctx, lpcfg_wins_url(lp_ctx)), NULL, NULL, flags); if (!h->ldb) goto failed; @@ -1011,7 +1011,7 @@ struct winsdb_handle *winsdb_connect(TALLOC_CTX *mem_ctx, flags |= LDB_FLG_NOSYNC; } - h->ldb = ldb_wrap_connect(h, ev_ctx, lp_ctx, lock_path(h, lp_ctx, lpcfg_wins_url(lp_ctx)), + h->ldb = ldb_wrap_connect(h, ev_ctx, lp_ctx, lpcfg_lock_path(h, lp_ctx, lpcfg_wins_url(lp_ctx)), NULL, NULL, flags); if (!h->ldb) goto failed; 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; diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c index 656da4df20..2466a60705 100644 --- a/source4/smb_server/smb/negprot.c +++ b/source4/smb_server/smb/negprot.c @@ -278,7 +278,7 @@ static void reply_nt1(struct smbsrv_request *req, uint16_t choice) capabilities |= CAP_LARGE_READX | CAP_LARGE_WRITEX | CAP_W2K_SMBS; } - large_test_path = lock_path(req, req->smb_conn->lp_ctx, "large_test.dat"); + large_test_path = lpcfg_lock_path(req, req->smb_conn->lp_ctx, "large_test.dat"); if (large_file_support(large_test_path)) { capabilities |= CAP_LARGE_FILES; } |