param: rename lp function and variable from "shortpreservecase" to "short_preserve_case"

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 1e4eacf9185351b5998544a71d0ead31c9508cf9..1ac20c66f333084c9850add6e0156568064f0aba 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -85,7 +85,7 @@ FN_LOCAL_BOOL(preexec_close, preexec_close)
 FN_LOCAL_BOOL(rootpreexec_close, rootpreexec_close)
 FN_LOCAL_INTEGER(case_sensitive, case_sensitive)
 FN_LOCAL_BOOL(preserve_case, preserve_case)
-FN_LOCAL_BOOL(shortpreservecase, shortpreservecase)
+FN_LOCAL_BOOL(short_preserve_case, short_preserve_case)
 FN_LOCAL_BOOL(hide_dot_files, hide_dot_files)
 FN_LOCAL_BOOL(hide_special_files, hide_special_files)
 FN_LOCAL_BOOL(hide_unreadable, hide_unreadable)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 756e5efe0d4425dcaaf3fc3b262fd29245e4dc78..42537fcb56e42553f69ccaf93324c73113ce8410 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2406,7 +2406,7 @@ static struct parm_struct parm_table[] = {
                .label          = "short preserve case",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(shortpreservecase),
+               .offset         = LOCAL_VAR(short_preserve_case),
                .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 3aa38bba27b13428b1bb8b28278e76a373ca64d7..ed7fc0668a0644c66c2cf2c0d74b8409b0200241 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -205,7 +205,7 @@ static struct loadparm_service sDefault =
        .rootpreexec_close = false,
        .case_sensitive = Auto,
        .preserve_case = true,
-       .shortpreservecase = true,
+       .short_preserve_case = true,
        .hide_dot_files = true,
        .hide_special_files = false,
        .hide_unreadable = false,

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index ff66fcd8579fab0ec0679f1c8aa0422580af70a4..624846a54157af6cbaa9b7a18942ab8cd801d5fa 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -571,7 +571,7 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
        }
 
        conn->case_preserve = lp_preserve_case(snum);
-       conn->short_case_preserve = lp_shortpreservecase(snum);
+       conn->short_case_preserve = lp_short_preserve_case(snum);
 
        conn->encrypt_level = lp_smb_encrypt(snum);