param: rename lp function and variable from "preservecase" to "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 6cafcfe934d49853597020ab6ce38226e880f3a6..1e4eacf9185351b5998544a71d0ead31c9508cf9 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -84,7 +84,7 @@ FN_LOCAL_BOOL(autoloaded, autoloaded)
 FN_LOCAL_BOOL(preexec_close, preexec_close)
 FN_LOCAL_BOOL(rootpreexec_close, rootpreexec_close)
 FN_LOCAL_INTEGER(case_sensitive, case_sensitive)
-FN_LOCAL_BOOL(preservecase, preservecase)
+FN_LOCAL_BOOL(preserve_case, preserve_case)
 FN_LOCAL_BOOL(shortpreservecase, shortpreservecase)
 FN_LOCAL_BOOL(hide_dot_files, hide_dot_files)
 FN_LOCAL_BOOL(hide_special_files, hide_special_files)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 751a1a2482af60c526e9169849fc5a43918769d5..756e5efe0d4425dcaaf3fc3b262fd29245e4dc78 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2397,7 +2397,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preserve case",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(preservecase),
+               .offset         = LOCAL_VAR(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 229879668d00f6f270197e287f3c8e556e7073ad..3aa38bba27b13428b1bb8b28278e76a373ca64d7 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -204,7 +204,7 @@ static struct loadparm_service sDefault =
        .preexec_close = false,
        .rootpreexec_close = false,
        .case_sensitive = Auto,
-       .preservecase = true,
+       .preserve_case = true,
        .shortpreservecase = true,
        .hide_dot_files = true,
        .hide_special_files = false,

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 60fae30d021dbddf4165b24a71febda121038fb0..ff66fcd8579fab0ec0679f1c8aa0422580af70a4 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -570,7 +570,7 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
                conn->case_sensitive = (bool)lp_case_sensitive(snum);
        }
 
-       conn->case_preserve = lp_preservecase(snum);
+       conn->case_preserve = lp_preserve_case(snum);
        conn->short_case_preserve = lp_shortpreservecase(snum);
 
        conn->encrypt_level = lp_smb_encrypt(snum);