param: rename lp function and variable from "magicscript" to "magic_script"

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 2533746b06a0e6204eb1cb039031f150073bceec..3d190497a4875a49a07c36177b50b69d9e364cde 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -65,7 +65,7 @@ FN_LOCAL_STRING(queuepausecommand, queuepausecommand)
 FN_LOCAL_STRING(queueresumecommand, queueresumecommand)
 FN_LOCAL_STRING(_printername, _printername)
 FN_LOCAL_CONST_STRING(printjob_username, printjob_username)
-FN_LOCAL_STRING(magicscript, magicscript)
+FN_LOCAL_STRING(magic_script, magic_script)
 FN_LOCAL_STRING(magic_output, magic_output)
 FN_LOCAL_STRING(comment, comment)
 FN_LOCAL_STRING(force_user, force_user)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 796e5b17c4e3c2108f171f1ddd3b78a098145cb6..89e52e1a8bfa01a457c79c1a984e1549db33a0a9 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3760,7 +3760,7 @@ static struct parm_struct parm_table[] = {
                .label          = "magic script",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(magicscript),
+               .offset         = LOCAL_VAR(magic_script),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 6e8313f1959491217a411e4299d43d88145ef924..17ea74b8a8e7bde1273ae91786e0dff8b7a13a16 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -170,7 +170,7 @@ static struct loadparm_service sDefault =
        .dont_descend = NULL,
        .hosts_allow = NULL,
        .hosts_deny = NULL,
-       .magicscript = NULL,
+       .magic_script = NULL,
        .magic_output = NULL,
        .veto_files = NULL,
        .hide_files = NULL,

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index b53c76550892cae942296c3bf732dd8a2d64c257..4fbd442fc33aa3762b25ff50bc261693bd29adfa 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -47,7 +47,7 @@ static NTSTATUS check_magic(struct files_struct *fsp)
        char *fname = NULL;
        NTSTATUS status;
 
-       if (!*lp_magicscript(talloc_tos(), SNUM(conn))) {
+       if (!*lp_magic_script(talloc_tos(), SNUM(conn))) {
                return NT_STATUS_OK;
        }
 
@@ -63,7 +63,7 @@ static NTSTATUS check_magic(struct files_struct *fsp)
                p++;
        }
 
-       if (!strequal(lp_magicscript(talloc_tos(), SNUM(conn)),p)) {
+       if (!strequal(lp_magic_script(talloc_tos(), SNUM(conn)),p)) {
                status = NT_STATUS_OK;
                goto out;
        }