param: rename lp function and variable from "delete_share_cmd" to "delete_share_command"

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 63f79c1f5a95b5cbc32b5c06d700bbba9e7a9e8d..e281f37804cdf710b9f78d482e5aad49b4f99807 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -380,7 +380,7 @@ FN_GLOBAL_STRING(check_password_script, check_password_script)
 FN_GLOBAL_STRING(cups_server, cups_server)
 FN_GLOBAL_STRING(defaultservice, defaultservice)
 FN_GLOBAL_STRING(deleteprinter_cmd, deleteprinter_cmd)
-FN_GLOBAL_STRING(delete_share_cmd, delete_share_cmd)
+FN_GLOBAL_STRING(delete_share_command, delete_share_command)
 FN_GLOBAL_STRING(delete_group_script, delete_group_script)
 FN_GLOBAL_STRING(delete_user_from_group_script, delete_user_from_group_script)
 FN_GLOBAL_STRING(delete_user_script, delete_user_script)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index e41ced429c5990c5d03d8a3ed422102a1e60db00..63be42c161d152af26a8a40104c8f0ef7d34f0db 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3262,7 +3262,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete share command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(delete_share_cmd),
+               .offset         = GLOBAL_VAR(delete_share_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 7c1d8237df46f6a36925bc0433d7153eead81265..8956ecefe0ce214f2d8bc1881543c71a89542013 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -1980,14 +1980,14 @@ WERROR _srvsvc_NetShareDel(struct pipes_struct *p,
        if (p->session_info->unix_token->uid != sec_initial_uid()  && !is_disk_op )
                return WERR_ACCESS_DENIED;
 
-       if (!lp_delete_share_cmd(talloc_tos()) || !*lp_delete_share_cmd(talloc_tos())) {
+       if (!lp_delete_share_command(talloc_tos()) || !*lp_delete_share_command(talloc_tos())) {
                DEBUG(10,("_srvsvc_NetShareDel: No delete share command\n"));
                return WERR_ACCESS_DENIED;
        }
 
        command = talloc_asprintf(ctx,
                        "%s \"%s\" \"%s\"",
-                       lp_delete_share_cmd(talloc_tos()),
+                       lp_delete_share_command(talloc_tos()),
                        get_dyn_CONFIGFILE(),
                        lp_servicename(talloc_tos(), snum));
        if (!command) {