diff options
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 4 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/service.c | 6 | ||||
| -rw-r--r-- | source4/param/share_classic.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 81601c63bf8..d74bb6d56b7 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -83,7 +83,7 @@ FN_LOCAL_STRING(dfree_command, dfree_command) FN_LOCAL_BOOL(autoloaded, autoloaded) FN_LOCAL_BOOL(preexec_close, preexec_close) FN_LOCAL_BOOL(rootpreexec_close, rootpreexec_close) -FN_LOCAL_INTEGER(casesensitive, casesensitive) +FN_LOCAL_INTEGER(case_sensitive, case_sensitive) FN_LOCAL_BOOL(preservecase, preservecase) FN_LOCAL_BOOL(shortpreservecase, shortpreservecase) FN_LOCAL_BOOL(hide_dot_files, hide_dot_files) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index cdb6eccca49..09ff63cd0ad 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2379,7 +2379,7 @@ static struct parm_struct parm_table[] = { .label = "case sensitive", .type = P_ENUM, .p_class = P_LOCAL, - .offset = LOCAL_VAR(casesensitive), + .offset = LOCAL_VAR(case_sensitive), .special = NULL, .enum_list = enum_bool_auto, .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, @@ -2388,7 +2388,7 @@ static struct parm_struct parm_table[] = { .label = "casesignames", .type = P_ENUM, .p_class = P_LOCAL, - .offset = LOCAL_VAR(casesensitive), + .offset = LOCAL_VAR(case_sensitive), .special = NULL, .enum_list = enum_bool_auto, .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL | FLAG_HIDE, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 224aedec79c..bde3e2370a7 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -203,7 +203,7 @@ static struct loadparm_service sDefault = .dfree_cache_time = 0, .preexec_close = false, .rootpreexec_close = false, - .casesensitive = Auto, + .case_sensitive = Auto, .preservecase = true, .shortpreservecase = true, .hide_dot_files = true, diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 8af85afec79..60fae30d021 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -206,7 +206,7 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir) last_flags = flags; /* Obey the client case sensitivity requests - only for clients that support it. */ - switch (lp_casesensitive(snum)) { + switch (lp_case_sensitive(snum)) { case Auto: { /* We need this uglyness due to DOS/Win9x clients that lie about case insensitivity. */ @@ -562,12 +562,12 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn, ( lp_enable_asu_support() && strequal(dev,"ADMIN$")) ); /* Case options for the share. */ - if (lp_casesensitive(snum) == Auto) { + if (lp_case_sensitive(snum) == Auto) { /* We will be setting this per packet. Set to be case * insensitive for now. */ conn->case_sensitive = False; } else { - conn->case_sensitive = (bool)lp_casesensitive(snum); + conn->case_sensitive = (bool)lp_case_sensitive(snum); } conn->case_preserve = lp_preservecase(snum); diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c index 4ff4b9e3539..9f00a6847ff 100644 --- a/source4/param/share_classic.c +++ b/source4/param/share_classic.c @@ -229,7 +229,7 @@ static bool sclassic_bool_option(struct share_config *scfg, const char *opt_name } if (strcmp(opt_name, SHARE_CI_FILESYSTEM) == 0) { - int case_sensitive = lpcfg_casesensitive(s, lpcfg_default_service(lp_ctx)); + int case_sensitive = lpcfg_case_sensitive(s, lpcfg_default_service(lp_ctx)); /* * Yes, this confusingly named option means Samba acts * case sensitive, so that the filesystem can act case |