param: rename lp function and variable from 'lockdir' to 'lock_directory'

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 247a129c23d8569392d4f0d58c08e6f23f188ad3..7ce456a9f5dfdb2e6d4ff44474f2320e561db9d5 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -244,7 +244,7 @@ FN_GLOBAL_CONST_STRING(dnsdomain, dnsdomain)
 FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder)
 FN_GLOBAL_CONST_STRING(dos_charset, dos_charset)
 FN_GLOBAL_CONST_STRING(guest_account, guest_account)
-FN_GLOBAL_CONST_STRING(lockdir, lockdir)
+FN_GLOBAL_CONST_STRING(lock_directory, lock_directory)
 FN_GLOBAL_CONST_STRING(logon_drive, logon_drive)
 FN_GLOBAL_CONST_STRING(logon_home, logon_home)
 FN_GLOBAL_CONST_STRING(logon_path, logon_path)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index ebd1f438da934cf5282866dd786f02e79af513f8..def012673bea782cac5dfdbf0fa4a11ffccd8a6d 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3298,7 +3298,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lock directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(lockdir),
+               .offset         = GLOBAL_VAR(lock_directory),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3307,7 +3307,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lock dir",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(lockdir),
+               .offset         = GLOBAL_VAR(lock_directory),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,

diff --git a/lib/param/util.c b/lib/param/util.c
index 8c3badfcb96ee0a8b3e59ed825500c248962998f..35743ea18a97793181363f8ba583cf5843c98ae6 100644 (file)
--- a/lib/param/util.c
+++ b/lib/param/util.c
@@ -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, lpcfg_lockdir(lp_ctx), name);
+       return lpcfg_common_path(mem_ctx, lpcfg_lock_directory(lp_ctx), name);
 }
 
 /**

diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h
index 4a41ba384387adf9470acd50e584f3ee3b3994a7..69728b6231a08f384d78f57e015a138d61088fcb 100644 (file)
--- a/nsswitch/winbind_struct_protocol.h
+++ b/nsswitch/winbind_struct_protocol.h
@@ -39,7 +39,7 @@ typedef char fstring[FSTRING_LEN];
  */
 #define WINBINDD_SOCKET_DIR_ENVVAR "WINBINDD_SOCKET_DIR"
 
-#define WINBINDD_PRIV_SOCKET_SUBDIR "winbindd_privileged" /* name of subdirectory of lp_lockdir() to hold the 'privileged' pipe */
+#define WINBINDD_PRIV_SOCKET_SUBDIR "winbindd_privileged" /* name of subdirectory of lp_lock_directory() to hold the 'privileged' pipe */
 #define WINBINDD_DOMAIN_ENV  "WINBINDD_DOMAIN" /* Environment variables */
 #define WINBINDD_DONT_ENV    "_NO_WINBINDD"
 #define WINBINDD_LOCATOR_KDC_ADDRESS "WINBINDD_LOCATOR_KDC_ADDRESS"

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 551beab867178b78639d01415b8264f7d06cb543..42fa79c1bec349b9e9aed0bdc994d0fbc1b06e88 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1517,7 +1517,7 @@ static char *xx_path(const char *name, const char *rootpath)
 
 char *lock_path(const char *name)
 {
-       return xx_path(name, lp_lockdir());
+       return xx_path(name, lp_lock_directory());
 }
 
 /**

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index f31de08d53c764d52c6b82629429fc3c25fa50ff..2c1e8f02610bcd1d49dd162590a7a579852ab063 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -969,10 +969,10 @@ static bool open_sockets(bool isdaemon, int port)
        }
 #endif
 
-       ok = directory_create_or_exist(lp_lockdir(), geteuid(), 0755);
+       ok = directory_create_or_exist(lp_lock_directory(), geteuid(), 0755);
        if (!ok) {
                DEBUG(0, ("Failed to create directory %s for lock files - %s\n",
-                         lp_lockdir(), strerror(errno)));
+                         lp_lock_directory(), strerror(errno)));
                exit(1);
        }
 

diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index d10b580a017e9f90a321d47588ddd45700fa3f49..19e3ed0e2b1a863a1e9dfb119a3b3ea91386f95e 100644 (file)
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -157,7 +157,7 @@ done:
        unstrcpy(s->server, name);
        s->ip = ip;
 
-       if (asprintf(&s->fname, "%s/sync.%d", lp_lockdir(), counter++) < 0) {
+       if (asprintf(&s->fname, "%s/sync.%d", lp_lock_directory(), counter++) < 0) {
                SAFE_FREE(s);
                goto done;
        }

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c7a95e1607775b8d78f398ce00a8dcbbfaca382a..a40fa8ee912217bac649a92d99d30b1c9d682876 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -768,7 +768,7 @@ static void init_globals(bool reinit_globals)
        string_set(&Globals.workgroup, DEFAULT_WORKGROUP);
 
        string_set(&Globals.passwd_program, "");
-       string_set(&Globals.lockdir, get_dyn_LOCKDIR());
+       string_set(&Globals.lock_directory, get_dyn_LOCKDIR());
        string_set(&Globals.szStateDir, get_dyn_STATEDIR());
        string_set(&Globals.szCacheDir, get_dyn_CACHEDIR());
        string_set(&Globals.piddir, get_dyn_PIDDIR());
@@ -1172,15 +1172,15 @@ static FN_GLOBAL_BOOL(_writeraw, bWriteRaw)
 
 /* If lp_statedir() and lp_cachedir() are explicitely set during the
  * build process or in smb.conf, we use that value.  Otherwise they
- * default to the value of lp_lockdir(). */
+ * default to the value of lp_lock_directory(). */
 const char *lp_statedir(void) {
        if ((strcmp(get_dyn_STATEDIR(), get_dyn_LOCKDIR()) != 0) ||
            (strcmp(get_dyn_STATEDIR(), Globals.szStateDir) != 0))
                return(*(char **)(&Globals.szStateDir) ?
                       *(char **)(&Globals.szStateDir) : "");
        else
-               return(*(char **)(&Globals.lockdir) ?
-                      *(char **)(&Globals.lockdir) : "");
+               return(*(char **)(&Globals.lock_directory) ?
+                      *(char **)(&Globals.lock_directory) : "");
 }
 const char *lp_cachedir(void) {
        if ((strcmp(get_dyn_CACHEDIR(), get_dyn_LOCKDIR()) != 0) ||
@@ -1188,8 +1188,8 @@ const char *lp_cachedir(void) {
                return(*(char **)(&Globals.szCacheDir) ?
                       *(char **)(&Globals.szCacheDir) : "");
        else
-               return(*(char **)(&Globals.lockdir) ?
-                      *(char **)(&Globals.lockdir) : "");
+               return(*(char **)(&Globals.lock_directory) ?
+                      *(char **)(&Globals.lock_directory) : "");
 }
 static FN_GLOBAL_INTEGER(winbind_max_domain_connections_int,
                  winbindMaxDomainConnections)

diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index 694ca086e38e59d4654464c98608212350babc19..75f34df1c2059a0d53b0e509254d744b6a1fe391 100644 (file)
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -49,7 +49,7 @@ static bool irix_oplocks_available(void)
 
        tmpname = talloc_asprintf(ctx,
                                "%s/koplock.%d",
-                               lp_lockdir(),
+                               lp_lock_directory(),
                                (int)getpid());
        if (!tmpname) {
                TALLOC_FREE(ctx);

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 30323a227419dcbe9cadf9a837c34f5da8ef87a8..6d7af26a6e74dad30cfe7cc0bcf85d827370543f 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3088,7 +3088,7 @@ bool fork_echo_handler(struct smbd_server_connection *sconn)
                DEBUG(1, ("pipe() failed: %s\n", strerror(errno)));
                return false;
        }
-       sconn->smb1.echo_handler.socket_lock_fd = create_unlink_tmp(lp_lockdir());
+       sconn->smb1.echo_handler.socket_lock_fd = create_unlink_tmp(lp_lock_directory());
        if (sconn->smb1.echo_handler.socket_lock_fd == -1) {
                DEBUG(1, ("Could not create lock fd: %s\n", strerror(errno)));
                goto fail;

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index feb47daf50250b54423525fd0f94e4c7a622a843..81b66b7ee07bb723b7f25f92dddc8a800952cd52 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1337,8 +1337,8 @@ extern void build_options(bool screen);
                setpgid( (pid_t)0, (pid_t)0);
 #endif
 
-       if (!directory_exist(lp_lockdir()))
-               mkdir(lp_lockdir(), 0755);
+       if (!directory_exist(lp_lock_directory()))
+               mkdir(lp_lock_directory(), 0755);
 
        if (!directory_exist(lp_piddir()))
                mkdir(lp_piddir(), 0755);

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index f905875a658ad4da432efa9dfbf3ce4e0a1146bb..98806016c84436d4a3d1282d51483d3d175d1ee7 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -88,14 +88,14 @@ static int do_global_checks(void)
                                "must differ.\n\n");
        }
 
-       if (!directory_exist_stat(lp_lockdir(), &st)) {
+       if (!directory_exist_stat(lp_lock_directory(), &st)) {
                fprintf(stderr, "ERROR: lock directory %s does not exist\n\n",
-                      lp_lockdir());
+                      lp_lock_directory());
                ret = 1;
        } else if ((st.st_ex_mode & 0777) != 0755) {
                fprintf(stderr, "WARNING: lock directory %s should have "
                                "permissions 0755 for browsing to work\n\n",
-                      lp_lockdir());
+                      lp_lock_directory());
        }
 
        if (!directory_exist_stat(lp_statedir(), &st)) {

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 8c480e523c94679500e574aaf90d640dc9d625dc..65b30d3c530f49316a49842d59193b5b3172ee0a 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1481,10 +1481,10 @@ int main(int argc, char **argv, char **envp)
                exit(1);
        }
 
-       ok = directory_create_or_exist(lp_lockdir(), geteuid(), 0755);
+       ok = directory_create_or_exist(lp_lock_directory(), geteuid(), 0755);
        if (!ok) {
                DEBUG(0, ("Failed to create directory %s for lock files - %s\n",
-                         lp_lockdir(), strerror(errno)));
+                         lp_lock_directory(), strerror(errno)));
                exit(1);
        }
 

diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 857d1c3899ac9dfb9f8342e25fcb8fe421f4d43a..15a3c3beb8be87b3bbedf8134160fdb00f4fc47b 100644 (file)
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -823,7 +823,7 @@ _PUBLIC_ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent
        if (composite_nomem(s->pipe, c)) return c;
 
        if (DEBUGLEVEL >= 10)
-               s->pipe->conn->packet_log_dir = lpcfg_lockdir(lp_ctx);
+               s->pipe->conn->packet_log_dir = lpcfg_lock_directory(lp_ctx);
 
        /* store parameters in state structure */
        s->binding      = binding;

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 6ab355f2fdbbe75d72def69ca1dcec85f9ca272a..85274c9dbe04b85b87801aa61442f709ee58f25b 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -388,7 +388,7 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
 
        p->dce_ctx = dce_ctx;
        p->endpoint = ep;
-       p->packet_log_dir = lpcfg_lockdir(dce_ctx->lp_ctx);
+       p->packet_log_dir = lpcfg_lock_directory(dce_ctx->lp_ctx);
        p->auth_state.session_info = session_info;
        p->auth_state.session_key = dcesrv_generic_session_key;
        p->event_ctx = event_ctx;

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 79fe2eee9ee7a86997b6d2e1ea4c238ad1d58f43..da839c5e0ce09c36a685d4b700e328941ad792cd 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -384,8 +384,8 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
        cleanup_tmp_files(cmdline_lp_ctx);
 
-       if (!directory_exist(lpcfg_lockdir(cmdline_lp_ctx))) {
-               mkdir(lpcfg_lockdir(cmdline_lp_ctx), 0755);
+       if (!directory_exist(lpcfg_lock_directory(cmdline_lp_ctx))) {
+               mkdir(lpcfg_lock_directory(cmdline_lp_ctx), 0755);
        }
 
        pidfile_create(lpcfg_piddir(cmdline_lp_ctx), binary_name);