param: rename lp function and variable from "magicoutput" to "magic_output"

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 6943036a771b103d466e4c925fe4564e2c8aabb1..2533746b06a0e6204eb1cb039031f150073bceec 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -66,7 +66,7 @@ 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(magicoutput, magicoutput)
+FN_LOCAL_STRING(magic_output, magic_output)
 FN_LOCAL_STRING(comment, comment)
 FN_LOCAL_STRING(force_user, force_user)
 FN_LOCAL_STRING(force_group, force_group)

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

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index eff908c9a5b518b547949f4f53711743cbdbc84b..6e8313f1959491217a411e4299d43d88145ef924 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -171,7 +171,7 @@ static struct loadparm_service sDefault =
        .hosts_allow = NULL,
        .hosts_deny = NULL,
        .magicscript = NULL,
-       .magicoutput = NULL,
+       .magic_output = NULL,
        .veto_files = NULL,
        .hide_files = NULL,
        .veto_oplock_files = NULL,

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index cb6882a90dfcb8187169f821fbd14674f1376ddc..b53c76550892cae942296c3bf732dd8a2d64c257 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -68,8 +68,8 @@ static NTSTATUS check_magic(struct files_struct *fsp)
                goto out;
        }
 
-       if (*lp_magicoutput(talloc_tos(), SNUM(conn))) {
-               magic_output = lp_magicoutput(talloc_tos(), SNUM(conn));
+       if (*lp_magic_output(talloc_tos(), SNUM(conn))) {
+               magic_output = lp_magic_output(talloc_tos(), SNUM(conn));
        } else {
                magic_output = talloc_asprintf(ctx,
                                "%s.out",