param: rename lp function and variable from 'manglednames' to 'mangled_names'

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 d74bb6d56b758d59a6e10d1fc53c3465ba6fbd26..691fd8784539cc649d566b4fb486dc9e95674052 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -104,7 +104,7 @@ FN_LOCAL_BOOL(kernel_oplocks, kernel_oplocks)
 FN_LOCAL_BOOL(level2_oplocks, level2_oplocks)
 FN_LOCAL_BOOL(kernel_share_modes, kernel_share_modes)
 FN_LOCAL_BOOL(onlyuser, onlyuser)
-FN_LOCAL_PARM_BOOL(manglednames, manglednames)
+FN_LOCAL_PARM_BOOL(mangled_names, mangled_names)
 FN_LOCAL_BOOL(symlinks, symlinks)
 FN_LOCAL_BOOL(syncalways, syncalways)
 FN_LOCAL_BOOL(strict_allocate, strict_allocate)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 09ff63cd0ad265c6aa49cc0cd4adeedf64a2abe8..ab8961924fbd6e541c3fc1fab05afd2be65526d9 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2532,7 +2532,7 @@ static struct parm_struct parm_table[] = {
                .label          = "mangled names",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(manglednames),
+               .offset         = LOCAL_VAR(mangled_names),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index bde3e2370a7cb725ea0261f7f8c0e4f4ac0555c1..e998a1cab49ec6995b99cf29d67242b1867a80a2 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -231,7 +231,7 @@ static struct loadparm_service sDefault =
        .kernel_oplocks = false,
        .level2_oplocks = true,
        .onlyuser = false,
-       .manglednames = true,
+       .mangled_names = true,
        .bWidelinks = false,
        .symlinks = true,
        .syncalways = false,

diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index 55da33a2580111fbdea0909e899df2f8dd74f129..60a17c5e41f6f42038323671d1ec81bad8f57960 100644 (file)
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -104,7 +104,7 @@ bool mangle_is_8_3_wildcards(const char *fname, bool check_case,
 bool mangle_must_mangle(const char *fname,
                   const struct share_params *p)
 {
-       if (!lp_manglednames(p)) {
+       if (!lp_mangled_names(p)) {
                return False;
        }
        return mangle_fns->must_mangle(fname, p);
@@ -140,7 +140,7 @@ bool name_to_8_3(const char *in,
 
        /* name mangling can be disabled for speed, in which case
           we just truncate the string */
-       if (!lp_manglednames(p)) {
+       if (!lp_mangled_names(p)) {
                strlcpy(out, in, 13);
                return True;
        }

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index bd5ab1fb0baf92a07825573a464a9b9fefdebd35..b903badc7530ef345537b32da13fc8246a741953 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2211,7 +2211,7 @@ bool smbd_dirptr_lanman2_entry(TALLOC_CTX *ctx,
        ZERO_STRUCT(state);
        state.conn = conn;
        state.info_level = info_level;
-       state.check_mangled_names = lp_manglednames(conn->params);
+       state.check_mangled_names = lp_mangled_names(conn->params);
        state.has_wild = dptr_has_wild(dirptr);
        state.got_exact_match = false;