param: rename lp function and variable from 'defaultcase' to 'default_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 691fd8784539cc649d566b4fb486dc9e95674052..0d2fcb413f1bd099ac34cb7c3f0b136044326e72 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -133,7 +133,7 @@ FN_LOCAL_BOOL(acl_check_permissions, acl_check_permissions)
 FN_LOCAL_BOOL(acl_group_control, acl_group_control)
 FN_LOCAL_BOOL(acl_map_full_control, acl_map_full_control)
 FN_LOCAL_BOOL(acl_allow_execute_always, acl_allow_execute_always)
-FN_LOCAL_INTEGER(defaultcase, defaultcase)
+FN_LOCAL_INTEGER(default_case, default_case)
 FN_LOCAL_INTEGER(minprintspace, minprintspace)
 FN_LOCAL_INTEGER(printing, printing)
 FN_LOCAL_INTEGER(max_reported_jobs, max_reported_jobs)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index ab8961924fbd6e541c3fc1fab05afd2be65526d9..c32477d0c6100cf339c3920f706ff72b75c439df 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2370,7 +2370,7 @@ static struct parm_struct parm_table[] = {
                .label          = "default case",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(defaultcase),
+               .offset         = LOCAL_VAR(default_case),
                .special        = NULL,
                .enum_list      = enum_case,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e998a1cab49ec6995b99cf29d67242b1867a80a2..38039ad75256595be999aa1c0e14490a95d4c79f 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -195,7 +195,7 @@ static struct loadparm_service sDefault =
        .directory_mask = 0755,
        .force_directory_mode = 0,
        .max_connections = 0,
-       .defaultcase = CASE_LOWER,
+       .default_case = CASE_LOWER,
        .printing = DEFAULT_PRINTING,
        .oplock_contention_limit = 2,
        .csc_policy = 0,

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index eaec5b639e59855153c6c9e2fcd3bbb357ae5fde..56c36e02ec9c753e606723fe4488ae17d712c988 100644 (file)
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -323,7 +323,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
 
        if (conn->case_sensitive && !conn->case_preserve &&
                        !conn->short_case_preserve) {
-               if (!strnorm(smb_fname->base_name, lp_defaultcase(SNUM(conn)))) {
+               if (!strnorm(smb_fname->base_name, lp_default_case(SNUM(conn)))) {
                        DEBUG(0, ("strnorm %s failed\n", smb_fname->base_name));
                        status = NT_STATUS_INVALID_PARAMETER;
                        goto err;
@@ -770,7 +770,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                                                   conn->params) &&
                                                 !conn->short_case_preserve)) {
                                        if (!strnorm(start,
-                                                       lp_defaultcase(SNUM(conn)))) {
+                                                       lp_default_case(SNUM(conn)))) {
                                                DEBUG(0, ("strnorm %s failed\n",
                                                        start));
                                                status = NT_STATUS_INVALID_PARAMETER;

diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index 60a17c5e41f6f42038323671d1ec81bad8f57960..a8988f0219987e805a9ddd05a8eade9f01823dba 100644 (file)
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -148,6 +148,6 @@ bool name_to_8_3(const char *in,
        return mangle_fns->name_to_8_3(in,
                                out,
                                cache83,
-                               lp_defaultcase(p->service),
+                               lp_default_case(p->service),
                                p);
 }