summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-09-27 05:45:21 +0200
committerMichael Adam <obnox@samba.org>2013-10-17 16:24:52 +0200
commit307abd61df586baac6cb0bef4272c633c526a7bf (patch)
tree48c6c70364f0e541e5925a35536e5d7ca1f4ad33
parente20c66d78099bcf5d965bd9d59669fe393481517 (diff)
downloadsamba-307abd61df586baac6cb0bef4272c633c526a7bf.tar.gz
samba-307abd61df586baac6cb0bef4272c633c526a7bf.tar.bz2
samba-307abd61df586baac6cb0bef4272c633c526a7bf.zip
s3:libsmb: remove unused cli_state->case_sensitive
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10200 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/include/client.h2
-rw-r--r--source3/libsmb/clientgen.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/include/client.h b/source3/include/client.h
index babcfb8a66..35fa2f178a 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -89,8 +89,6 @@ struct cli_state {
bool use_oplocks; /* should we use oplocks? */
- bool case_sensitive; /* False by default. */
-
/* Where (if anywhere) this is mounted under DFS. */
char *dfs_mountpoint;
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index e717bb2ed3..8a3881018e 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -177,7 +177,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
cli->raw_status = NT_STATUS_INTERNAL_ERROR;
cli->map_dos_errors = true; /* remove this */
cli->timeout = CLIENT_TIMEOUT;
- cli->case_sensitive = false;
/* Set the CLI_FORCE_DOSERR environment variable to test
client routines using DOS errors instead of STATUS32
@@ -425,7 +424,7 @@ uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid)
bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive)
{
- bool ret = cli->case_sensitive;
+ bool ret;
uint32_t fs_attrs;
struct smbXcli_tcon *tcon;
@@ -436,6 +435,11 @@ bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive)
}
fs_attrs = smbXcli_tcon_get_fs_attributes(tcon);
+ if (fs_attrs & FILE_CASE_SENSITIVE_SEARCH) {
+ ret = true;
+ } else {
+ ret = false;
+ }
if (case_sensitive) {
fs_attrs |= FILE_CASE_SENSITIVE_SEARCH;
} else {
@@ -443,7 +447,6 @@ bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive)
}
smbXcli_tcon_set_fs_attributes(tcon, fs_attrs);
- cli->case_sensitive = case_sensitive;
return ret;
}