diff options
author | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2009-01-16 16:00:41 -0500 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2009-01-28 09:40:06 +0100 |
commit | 6b21fd6bfb3f70667b6c6b1292557e889cdabffb (patch) | |
tree | 345a766a4044ac703c4316a56e6f3288679f2526 /source | |
parent | 44f5047bfe8687c2eacc097d5b14c1e2a1bfcd55 (diff) | |
download | samba-6b21fd6bfb3f70667b6c6b1292557e889cdabffb.tar.gz |
Treat file names in POSIX-like case-sensitive fashion by default
*** THIS COMMIT CAUSES A CHANGE OF DEFAULT BEHAVIOR IN libsmbclient!!! ***
- libsmbclient now calls cli_set_case_sensitive() for a new CLI. By default,
it requests case-sensitive, but the old behavior of case-insensitive can be
requested with smbc_setOptionCaseSensitive(context, False);
The change of behavior is considered a bug fix, as it was previously
possible to accidentally overwrite a file that had the same case-insensitive
name but a different case-sensitive name as a previously-existing file,
while creating a new file.
Derrell
(cherry picked from commit ac4baafeb8d74bf1db7f2ce84b2bc3abdef90337)
Diffstat (limited to 'source')
-rw-r--r-- | source/include/libsmb_internal.h | 5 | ||||
-rw-r--r-- | source/include/libsmbclient.h | 9 | ||||
-rw-r--r-- | source/libsmb/libsmb_context.c | 1 | ||||
-rw-r--r-- | source/libsmb/libsmb_server.c | 9 | ||||
-rw-r--r-- | source/libsmb/libsmb_setget.c | 14 |
5 files changed, 37 insertions, 1 deletions
diff --git a/source/include/libsmb_internal.h b/source/include/libsmb_internal.h index 7cf03307123..307d6b261d2 100644 --- a/source/include/libsmb_internal.h +++ b/source/include/libsmb_internal.h @@ -176,6 +176,11 @@ struct SMBC_internal_data { */ smbc_smb_encrypt_level smb_encryption_level; + /* + * Should we request case sensitivity of file names? + */ + bool case_sensitive; + struct smbc_server_cache * server_cache; /* POSIX emulation functions */ diff --git a/source/include/libsmbclient.h b/source/include/libsmbclient.h index 74d0d5c9ddb..da2e03cf080 100644 --- a/source/include/libsmbclient.h +++ b/source/include/libsmbclient.h @@ -550,6 +550,15 @@ smbc_getOptionSmbEncryptionLevel(SMBCCTX *c); void smbc_setOptionSmbEncryptionLevel(SMBCCTX *c, smbc_smb_encrypt_level level); +/** Get whether to treat file names as case-sensitive. */ +smbc_bool +smbc_getOptionCaseSensitive(SMBCCTX *c); + +/** Set whether to treat file names as case-sensitive. */ +void +smbc_setOptionCaseSensitive(SMBCCTX *c, smbc_bool b); + + /** * Get from how many local master browsers should the list of workgroups be * retrieved. It can take up to 12 minutes or longer after a server becomes a diff --git a/source/libsmb/libsmb_context.c b/source/libsmb/libsmb_context.c index 5e075d10d6d..ec42b34e4d3 100644 --- a/source/libsmb/libsmb_context.c +++ b/source/libsmb/libsmb_context.c @@ -69,6 +69,7 @@ smbc_new_context(void) smbc_setOptionFullTimeNames(context, False); smbc_setOptionOpenShareMode(context, SMBC_SHAREMODE_DENY_NONE); smbc_setOptionSmbEncryptionLevel(context, SMBC_ENCRYPTLEVEL_NONE); + smbc_setOptionCaseSensitive(context, True); smbc_setOptionBrowseMaxLmbCount(context, 3); /* # LMBs to query */ smbc_setOptionUrlEncodeReaddirEntries(context, False); smbc_setOptionOneSharePerServer(context, False); diff --git a/source/libsmb/libsmb_server.c b/source/libsmb/libsmb_server.c index 4581d8452a0..d374ac12544 100644 --- a/source/libsmb/libsmb_server.c +++ b/source/libsmb/libsmb_server.c @@ -355,7 +355,14 @@ again: errno = ENOMEM; return NULL; } - + + /* POSIX-like - always request case-sensitivity by default. */ + if (smbc_getOptionCaseSensitive(context)) { + cli_set_case_sensitive(c, True); + } else { + cli_set_case_sensitive(c, False); + } + if (smbc_getOptionUseKerberos(context)) { c->use_kerberos = True; } diff --git a/source/libsmb/libsmb_setget.c b/source/libsmb/libsmb_setget.c index d0823bd77ec..bca2a80d14b 100644 --- a/source/libsmb/libsmb_setget.c +++ b/source/libsmb/libsmb_setget.c @@ -193,6 +193,20 @@ smbc_setOptionSmbEncryptionLevel(SMBCCTX *c, smbc_smb_encrypt_level level) c->internal->smb_encryption_level = level; } +/** Get whether to treat file names as case-sensitive. */ +smbc_bool +smbc_getOptionCaseSensitive(SMBCCTX *c) +{ + return c->internal->case_sensitive; +} + +/** Set whether to treat file names as case-sensitive. */ +void +smbc_setOptionCaseSensitive(SMBCCTX *c, smbc_bool b) +{ + c->internal->case_sensitive = b; +} + /** * Get from how many local master browsers should the list of workgroups be * retrieved. It can take up to 12 minutes or longer after a server becomes a |