param: rename lp function and variable from 'piddir' to 'pid_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 8e0bdae3e4e61fb6d50c4c00919591720f3ef8a1..b52263066e05d86c3414fc6668ce3ea19ac02f43 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -256,7 +256,7 @@ FN_GLOBAL_CONST_STRING(netbios_scope, netbios_scope)
 FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, ntp_signd_socket_directory)
 FN_GLOBAL_CONST_STRING(passdb_backend, passdb_backend)
 FN_GLOBAL_CONST_STRING(password_server, password_server)
-FN_GLOBAL_CONST_STRING(piddir, piddir)
+FN_GLOBAL_CONST_STRING(pid_directory, pid_directory)
 FN_GLOBAL_CONST_STRING(private_dir, private_dir)
 FN_GLOBAL_CONST_STRING(realm, realm)
 FN_GLOBAL_CONST_STRING(smb_passwd_file, smb_passwd_file)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 356ab0fa88d28b1c08fd9e09471615650ac21ff3..f8f38ed021924547ef9b0a63ea560743c26437f0 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3334,7 +3334,7 @@ static struct parm_struct parm_table[] = {
                .label          = "pid directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(piddir),
+               .offset         = GLOBAL_VAR(pid_directory),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index ac4a00d423d82769d800523704a65f59f5f4a7f9..be237540316cb26fdf49a4502a23ee5504d780dd 100644 (file)
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -328,7 +328,7 @@ struct tevent_req *nbt_getdc_send(TALLOC_CTX *mem_ctx,
        if (tevent_req_nomem(state->my_mailslot, req)) {
                return tevent_req_post(req, ev);
        }
-       state->nmbd_pid = pidfile_pid(lp_piddir(), "nmbd");
+       state->nmbd_pid = pidfile_pid(lp_pid_directory(), "nmbd");
        if (state->nmbd_pid == 0) {
                DEBUG(3, ("No nmbd found\n"));
                tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 2c1e8f02610bcd1d49dd162590a7a579852ab063..fd222c25c16e5d61b64b9115bde15873bd7750a4 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -72,7 +72,7 @@ static void terminate(struct messaging_context *msg)
        gencache_stabilize();
        serverid_deregister(messaging_server_id(msg));
 
-       pidfile_unlink(lp_piddir(), "nmbd");
+       pidfile_unlink(lp_pid_directory(), "nmbd");
 
        exit(0);
 }
@@ -976,14 +976,14 @@ static bool open_sockets(bool isdaemon, int port)
                exit(1);
        }
 
-       ok = directory_create_or_exist(lp_piddir(), geteuid(), 0755);
+       ok = directory_create_or_exist(lp_pid_directory(), geteuid(), 0755);
        if (!ok) {
                DEBUG(0, ("Failed to create directory %s for pid files - %s\n",
-                         lp_piddir(), strerror(errno)));
+                         lp_pid_directory(), strerror(errno)));
                exit(1);
        }
 
-       pidfile_create(lp_piddir(), "nmbd");
+       pidfile_create(lp_pid_directory(), "nmbd");
 
        status = reinit_after_fork(msg, nmbd_event_context(),
                                   false);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 15999d6d6aeef3c28b5a9930817bcb21b4cf1f6d..31be7b03226854f13c5a60a093a587b31c7dbe37 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -771,7 +771,7 @@ static void init_globals(bool reinit_globals)
        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());
+       string_set(&Globals.pid_directory, get_dyn_PIDDIR());
        string_set(&Globals.nbt_client_socket_address, "0.0.0.0");
        /*
         * By default support explicit binding to broadcast

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 81b66b7ee07bb723b7f25f92dddc8a800952cd52..412c9aab0976c549be9d6e42d83d34bf893cbc1d 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1340,11 +1340,11 @@ extern void build_options(bool screen);
        if (!directory_exist(lp_lock_directory()))
                mkdir(lp_lock_directory(), 0755);
 
-       if (!directory_exist(lp_piddir()))
-               mkdir(lp_piddir(), 0755);
+       if (!directory_exist(lp_pid_directory()))
+               mkdir(lp_pid_directory(), 0755);
 
        if (is_daemon)
-               pidfile_create(lp_piddir(), "smbd");
+               pidfile_create(lp_pid_directory(), "smbd");
 
        status = reinit_after_fork(msg_ctx,
                                   ev_ctx,

diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index dfa2b1dacb07033457d75d72e5161284b11aec21..18a1a465dfd35bcbf4257cb26b017572c5a669ee 100644 (file)
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -211,7 +211,7 @@ static void exit_server_common(enum server_exit_reason how,
                DEBUG(3,("Server exit (%s)\n",
                        (reason ? reason : "normal exit")));
                if (am_parent) {
-                       pidfile_unlink(lp_piddir(), "smbd");
+                       pidfile_unlink(lp_pid_directory(), "smbd");
                }
                gencache_stabilize();
        }

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 7299bc43985b254049f4b498c566343f244667da..156a7ad352d336bf036125e1da8e1545ed27b81b 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1441,7 +1441,7 @@ static struct server_id parse_dest(struct messaging_context *msg,
 
        /* Look up other destinations in pidfile directory */
 
-       if ((pid = pidfile_pid(lp_piddir(), dest)) != 0) {
+       if ((pid = pidfile_pid(lp_pid_directory(), dest)) != 0) {
                return pid_to_procid(pid);
        }
 

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index f33180d14c2e0d5fa8b801cd8a85f2215b38126c..bf024c6bab07ddd8a687be754d85d5b62c8c975d 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -118,9 +118,9 @@ static int do_global_checks(void)
                       lp_cachedir());
        }
 
-       if (!directory_exist_stat(lp_piddir(), &st)) {
+       if (!directory_exist_stat(lp_pid_directory(), &st)) {
                fprintf(stderr, "ERROR: pid directory %s does not exist\n\n",
-                      lp_piddir());
+                      lp_pid_directory());
                ret = 1;
        }
 

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 65b30d3c530f49316a49842d59193b5b3172ee0a..a22c6b796d8a636ddd89d67774e2ba743901a4b7 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -217,7 +217,7 @@ static void terminate(bool is_parent)
                struct messaging_context *msg = winbind_messaging_context();
                struct server_id self = messaging_server_id(msg);
                serverid_deregister(self);
-               pidfile_unlink(lp_piddir(), "winbindd");
+               pidfile_unlink(lp_pid_directory(), "winbindd");
        }
 
        exit(0);
@@ -1488,10 +1488,10 @@ int main(int argc, char **argv, char **envp)
                exit(1);
        }
 
-       ok = directory_create_or_exist(lp_piddir(), geteuid(), 0755);
+       ok = directory_create_or_exist(lp_pid_directory(), geteuid(), 0755);
        if (!ok) {
                DEBUG(0, ("Failed to create directory %s for pid files - %s\n",
-                         lp_piddir(), strerror(errno)));
+                         lp_pid_directory(), strerror(errno)));
                exit(1);
        }
 
@@ -1529,7 +1529,7 @@ int main(int argc, char **argv, char **envp)
        if (!interactive)
                become_daemon(Fork, no_process_group, log_stdout);
 
-       pidfile_create(lp_piddir(), "winbindd");
+       pidfile_create(lp_pid_directory(), "winbindd");
 
 #if HAVE_SETPGID
        /*

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index da839c5e0ce09c36a685d4b700e328941ad792cd..26fd89a10d75ccf914ab3cc5d196c9677e19c3b7 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -388,7 +388,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
                mkdir(lpcfg_lock_directory(cmdline_lp_ctx), 0755);
        }
 
-       pidfile_create(lpcfg_piddir(cmdline_lp_ctx), binary_name);
+       pidfile_create(lpcfg_pid_directory(cmdline_lp_ctx), binary_name);
 
        /* Set up a database to hold a random seed, in case we don't
         * have /dev/urandom */