param: rename lp function and variable from "rootpreexec" to "root_preexec"

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 81b619ff4ebaa0a55ba1bda31b60001815bd4164..53a0dc59cc0f1349b9b3c3bacc55583b5a5489d4 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -49,7 +49,7 @@ FN_LOCAL_INTEGER(directory_mask, directory_mask)
 FN_LOCAL_INTEGER(force_directory_mode, force_directory_mode)
 FN_LOCAL_STRING(preexec, preexec)
 FN_LOCAL_STRING(postexec, postexec)
-FN_LOCAL_STRING(rootpreexec, rootpreexec)
+FN_LOCAL_STRING(root_preexec, root_preexec)
 FN_LOCAL_STRING(root_postexec, root_postexec)
 FN_LOCAL_STRING(dont_descend, dont_descend)
 FN_LOCAL_STRING(username, username)
@@ -82,7 +82,7 @@ FN_LOCAL_STRING(aio_write_behind, aio_write_behind)
 FN_LOCAL_STRING(dfree_command, dfree_command)
 FN_LOCAL_BOOL(autoloaded, autoloaded)
 FN_LOCAL_BOOL(preexec_close, preexec_close)
-FN_LOCAL_BOOL(rootpreexec_close, rootpreexec_close)
+FN_LOCAL_BOOL(root_preexec_close, root_preexec_close)
 FN_LOCAL_INTEGER(case_sensitive, case_sensitive)
 FN_LOCAL_BOOL(preserve_case, preserve_case)
 FN_LOCAL_BOOL(short_preserve_case, short_preserve_case)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 2c8fbf2e4dd75bd424ca8f7b8ac28c398ec5d3a7..cc7165561c7c04de9d6bfaa03ae06e7601b7e821 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3598,7 +3598,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root preexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(rootpreexec),
+               .offset         = LOCAL_VAR(root_preexec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -3607,7 +3607,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root preexec close",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(rootpreexec_close),
+               .offset         = LOCAL_VAR(root_preexec_close),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e08e2c3ba26a18e2fe74a267bae02b469bbe1d04..fbd9a417db9e2c0fa21e832d96caaa752cf99467 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -155,7 +155,7 @@ static struct loadparm_service sDefault =
        .szInclude = NULL,
        .preexec = NULL,
        .postexec = NULL,
-       .rootpreexec = NULL,
+       .root_preexec = NULL,
        .root_postexec = NULL,
        .cups_options = NULL,
        .printcommand = NULL,
@@ -202,7 +202,7 @@ static struct loadparm_service sDefault =
        .block_size = 1024,
        .dfree_cache_time = 0,
        .preexec_close = false,
-       .rootpreexec_close = false,
+       .root_preexec_close = false,
        .case_sensitive = Auto,
        .preserve_case = true,
        .short_preserve_case = true,

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 13241687078ac3887df935cf9ab0850abeafe6aa..30614cd2bc39cc7afdeec0e5583f71032d6460c8 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -698,7 +698,7 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
        /* Preexecs are done here as they might make the dir we are to ChDir
         * to below */
        /* execute any "root preexec = " line */
-       if (*lp_rootpreexec(talloc_tos(), snum)) {
+       if (*lp_root_preexec(talloc_tos(), snum)) {
                char *cmd = talloc_sub_advanced(talloc_tos(),
                                        lp_servicename(talloc_tos(), SNUM(conn)),
                                        conn->session_info->unix_info->unix_name,
@@ -706,11 +706,11 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
                                        conn->session_info->unix_token->gid,
                                        conn->session_info->unix_info->sanitized_username,
                                        conn->session_info->info->domain_name,
-                                       lp_rootpreexec(talloc_tos(), snum));
+                                       lp_root_preexec(talloc_tos(), snum));
                DEBUG(5,("cmd=%s\n",cmd));
                ret = smbrun(cmd,NULL);
                TALLOC_FREE(cmd);
-               if (ret != 0 && lp_rootpreexec_close(snum)) {
+               if (ret != 0 && lp_root_preexec_close(snum)) {
                        DEBUG(1,("root preexec gave %d - failing "
                                 "connection\n", ret));
                        status = NT_STATUS_ACCESS_DENIED;