summaryrefslogtreecommitdiffstats
path: root/source/smbd/mangle.c
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-02-11 22:53:29 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-02-11 22:53:29 +0000
commitf22ac13b1423186d463c9fc5b3588a3dcbd7bc1c (patch)
treee7e032f417c58204ee9803dea853c8c73623bc44 /source/smbd/mangle.c
parent617370314ef0d19002243105f5c8a549e3397152 (diff)
downloadsamba-f22ac13b1423186d463c9fc5b3588a3dcbd7bc1c.tar.gz
samba-f22ac13b1423186d463c9fc5b3588a3dcbd7bc1c.tar.xz
samba-f22ac13b1423186d463c9fc5b3588a3dcbd7bc1c.zip
Replaced YOST code with more functionally equivalent code that
changes a bit less. Also added fix to tricky reply_mv case. jra@cygnus.com
Diffstat (limited to 'source/smbd/mangle.c')
-rw-r--r--source/smbd/mangle.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/source/smbd/mangle.c b/source/smbd/mangle.c
index c0baa659821..5fdf31b7a41 100644
--- a/source/smbd/mangle.c
+++ b/source/smbd/mangle.c
@@ -79,7 +79,7 @@ static BOOL is_reserved_msdos(char *fname)
/****************************************************************************
return True if a name is in 8.3 dos format
****************************************************************************/
-BOOL is_8_3(char *fname)
+BOOL is_8_3(char *fname, BOOL check_case)
{
int len;
char *dot_pos;
@@ -91,8 +91,7 @@ BOOL is_8_3(char *fname)
DEBUG(5,("checking %s for 8.3\n",fname));
- if (case_mangle)
-#ifndef YOSTW
+ if (check_case && case_mangle)
switch (case_default)
{
case CASE_LOWER:
@@ -102,10 +101,6 @@ BOOL is_8_3(char *fname)
if (strhaslower(fname)) return(False);
break;
}
-#endif
-#ifdef YOSTW
- if (strhasupper(fname) && strhaslower(fname)) return(False);
-#endif
/* can't be longer than 12 chars */
if (len == 0 || len > 12)
@@ -652,7 +647,7 @@ BOOL name_map_mangle(char *OutName,BOOL need83,int snum)
}
/* check if it's already in 8.3 format */
- if (need83 && !is_8_3(OutName)) {
+ if (need83 && !is_8_3(OutName, True)) {
if (!lp_manglednames(snum)) return(False);
/* mangle it into 8.3 */