diff options
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/filename.c | 4 | ||||
| -rw-r--r-- | source3/smbd/mangle.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 691fd87845..0d2fcb413f 100644 --- 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 ab8961924f..c32477d0c6 100644 --- 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 e998a1cab4..38039ad752 100644 --- 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 eaec5b639e..56c36e02ec 100644 --- 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 60a17c5e41..a8988f0219 100644 --- 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); } |