diff options
| -rw-r--r-- | source3/include/proto.h | 12 | ||||
| -rw-r--r-- | source3/smbd/mangle.c | 1103 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 6 | ||||
| -rw-r--r-- | source3/smbd/server.c | 6 |
4 files changed, 706 insertions, 421 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index fb95a7d525..3e1f9f5fa3 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1078,13 +1078,13 @@ struct share_ops *locking_slow_init(int ronly); /*The following definitions come from mangle.c */ -int str_checksum(char *s); -BOOL is_8_3(char *fname, BOOL check_case); -void reset_mangled_stack( int size ); -BOOL check_mangled_stack(char *s); BOOL is_mangled( char *s ); -void mangle_name_83(char *s); -BOOL name_map_mangle(char *OutName,BOOL need83,int snum); +BOOL is_8_3( char *fname, BOOL check_case ); +int str_checksum( char *s ); +void reset_mangled_cache( void ); +BOOL check_mangled_cache( char *s ); +void mangle_name_83( char *s ); +BOOL name_map_mangle( char *OutName, BOOL need83, int snum ); /*The following definitions come from md4.c */ diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c index 8aa53bc35a..f4e39ef982 100644 --- a/source3/smbd/mangle.c +++ b/source3/smbd/mangle.c @@ -19,39 +19,159 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* -------------------------------------------------------------------------- ** + * Notable problems... + * + * March/April 1998 CRH + * - Many of the functions in this module overwrite string buffers passed to + * them. This causes a variety of problems and is, generally speaking, + * dangerous and scarry. See the kludge notes in name_map_mangle() + * below. + * - It seems that something is calling name_map_mangle() twice. The + * first call is probably some sort of test. Names which contain + * illegal characters are being doubly mangled. I'm not sure, but + * I'm guessing the problem is in server.c. + * + * -------------------------------------------------------------------------- ** + */ + +/* -------------------------------------------------------------------------- ** + * History... + * + * March/April 1998 CRH + * Updated a bit. Rewrote is_mangled() to be a bit more selective. + * Rewrote the mangled name cache. Added comments here and there. + * &c. + * -------------------------------------------------------------------------- ** + */ + #include "includes.h" +#include "ubiqx/ubi_Cache.h" -extern int DEBUGLEVEL; -extern int case_default; -extern BOOL case_mangle; -/**************************************************************************** - * Provide a checksum on a string +/* -------------------------------------------------------------------------- ** + * External Variables... + */ + +extern int DEBUGLEVEL; /* Global debug level. */ +extern int case_default; /* Are conforming 8.3 names all upper or lower? */ +extern BOOL case_mangle; /* If true, all chars in 8.3 should be same case. */ + +/* -------------------------------------------------------------------------- ** + * Other stuff... * - * Input: s - the nul-terminated character string for which the checksum - * will be calculated. - * Output: The checksum value calculated for s. + * magic_char - This is the magic char used for mangling. It's + * global. There is a call to lp_magicchar() in server.c + * that is used to override the initial value. + * + * basechars - The set of 36 characters used for name mangling. This + * is static (scope is this file only). + * + * base36() - Macro used to select a character from basechars (i.e., + * base36(n) will return the nth digit, modulo 36). + * + * chartest - array 0..255. The index range is the set of all possible + * values of a byte. For each byte value, the content is a + * two nibble pair. See BASECHAR_MASK and ILLEGAL_MASK, + * below. + * + * ct_initialized - False until the chartest array has been initialized via + * a call to init_chartest(). + * + * BASECHAR_MASK - Masks the upper nibble of a one-byte value. + * + * ILLEGAL_MASK - Masks the lower nibble of a one-byte value. + * + * isbasecahr() - Given a character, check the chartest array to see + * if that character is in the basechars set. This is + * faster than using strchr(). * - ****************************************************************************/ -int str_checksum(char *s) + * isillegal() - Given a character, check the chartest array to see + * if that character is in the illegal characters set. + * This is faster than using strchr(). + * + * mangled_cache - Cache header used for storing mangled -> original + * reverse maps. + * + * mc_initialized - False until the mangled_cache structure has been + * initialized via a call to reset_mangled_cache(). + * + * MANGLED_CACHE_MAX_ENTRIES - Default maximum number of entries for the + * cache. A value of 0 indicates "infinite". + * + * MANGLED_CACHE_MAX_MEMORY - Default maximum amount of memory for the + * cache. When the cache was kept as an array of 256 + * byte strings, the default cache size was 50 entries. + * This required a fixed 12.5Kbytes of memory. The + * mangled stack parameter is no longer used (though + * this might change). We're now using a fixed 16Kbyte + * maximum cache size. This will probably be much more + * than 50 entries. + */ + +char magic_char = '~'; + +static char basechars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + +static unsigned char chartest[256] = { 0 }; +static BOOL ct_initialized = False; + +#define base36(V) ((char)(basechars[(V) % 36])) +#define BASECHAR_MASK 0xf0 +#define ILLEGAL_MASK 0x0f +#define isbasechar(C) ( (chartest[ ((C) & 0xff) ]) & BASECHAR_MASK ) +#define isillegal(C) ( (chartest[ ((C) & 0xff) ]) & ILLEGAL_MASK ) + +static ubi_cacheRoot mangled_cache[1] = { 0 }; +static BOOL mc_initialized = False; +#define MANGLED_CACHE_MAX_ENTRIES 0 +#define MANGLED_CACHE_MAX_MEMORY 16384 + + +/* -------------------------------------------------------------------------- ** + * Functions... + */ + +/* ************************************************************************** ** + * Initialize the static character test array. + * + * Input: none + * + * Output: none + * + * Notes: This function changes (loads) the contents of the <chartest> + * array. The scope of <chartest> is this file. + * + * ************************************************************************** ** + */ +static void init_chartest( void ) { - int res = 0; - int c; - int i=0; + char *illegalchars = "*\\/?<>|\":"; + unsigned char *s; + + bzero( (char *)chartest, 256 ); - while( *s ) - { - c = *s; - res ^= (c << (i % 15)) ^ (c >> (15-(i%15))); - s++; i++; - } - return(res); - } /* str_checksum */ + for( s = (unsigned char *)illegalchars; *s; s++ ) + chartest[*s] = ILLEGAL_MASK; + + for( s = (unsigned char *)basechars; *s; s++ ) + chartest[*s] |= BASECHAR_MASK; -/**************************************************************************** -return True if a name is a special msdos reserved name -****************************************************************************/ -static BOOL is_reserved_msdos(char *fname) + ct_initialized = True; + } /* init_chartest */ + +/* ************************************************************************** ** + * Return True if a name is a special msdos reserved name. + * + * Input: fname - String containing the name to be tested. + * + * Output: True, if the name matches one of the list of reserved names. + * + * Notes: This is a static function called by is_8_3(), below. + * + * ************************************************************************** ** + */ +static BOOL is_reserved_msdos( char *fname ) { char upperFname[13]; char *p; @@ -59,67 +179,186 @@ static BOOL is_reserved_msdos(char *fname) StrnCpy (upperFname, fname, 12); /* lpt1.txt and con.txt etc are also illegal */ - p=strchr(upperFname,'.'); - if (p) - *p='\0'; - strupper (upperFname); - if ((strcmp(upperFname,"CLOCK$") == 0) || - (strcmp(upperFname,"CON") == 0) || - (strcmp(upperFname,"AUX") == 0) || - (strcmp(upperFname,"COM1") == 0) || - (strcmp(upperFname,"COM2") == 0) || - (strcmp(upperFname,"COM3") == 0) || - (strcmp(upperFname,"COM4") == 0) || - (strcmp(upperFname,"LPT1") == 0) || - (strcmp(upperFname,"LPT2") == 0) || - (strcmp(upperFname,"LPT3") == 0) || - (strcmp(upperFname,"NUL") == 0) || - (strcmp(upperFname,"PRN") == 0)) - return (True) ; - - return (False); + p = strchr(upperFname,'.'); + if( p ) + *p = '\0'; + + strupper( upperFname ); + p = upperFname + 1; + switch( upperFname[0] ) + { + case 'A': + if( 0 == strcmp( p, "UX" ) ) + return( True ); + break; + case 'C': + if( (0 == strcmp( p, "LOCK$" )) + || (0 == strcmp( p, "ON" )) + || (0 == strcmp( p, "OM1" )) + || (0 == strcmp( p, "OM2" )) + || (0 == strcmp( p, "OM3" )) + || (0 == strcmp( p, "OM4" )) + ) + return( True ); + break; + case 'L': + if( (0 == strcmp( p, "PT1" )) + || (0 == strcmp( p, "PT2" )) + || (0 == strcmp( p, "PT3" )) + ) + return( True ); + break; + case 'N': + if( 0 == strcmp( p, "UL" ) ) + return( True ); + break; + case 'P': + if( 0 == strcmp( p, "RN" ) ) + return( True ); + break; + } + + return( False ); } /* is_reserved_msdos */ +/* ************************************************************************** ** + * Determine whether or not a given name contains illegal characters, even + * long names. + * + * Input: name - The name to be tested. + * + * Output: True if an illegal character was found in <name>, else False. + * + * Notes: This is used to test a name on the host system, long or short, + * for characters that would be illegal on most client systems, + * particularly DOS and Windows systems. Unix and AmigaOS, for + * example, allow a filenames which contain such oddities as + * quotes ("). If a name is found which does contain an illegal + * character, it is mangled even if it conforms to the 8.3 + * format. + * + * ************************************************************************** ** + */ +static BOOL is_illegal_name( char *name ) + { + unsigned char *s; + int skip; + + if( !name ) + return( True ); + + if( !ct_initialized ) + init_chartest(); + + s = (unsigned char *)name; + while( *s ) + { + skip = skip_multibyte_char( *s ); + if( skip != 0 ) + { + s += skip; + } + else + { + if( isillegal( *s ) ) + return( True ); + else + s++; + } + } + + return( False ); + } /* is_illegal_name */ + +/* ************************************************************************** ** + * Return True if the name *could be* a mangled name. + * + * Input: s - A file name. + * + * Output: True if the name matches the pattern described below in the + * notes, else False. + * + * Notes: The input name is *not* tested for 8.3 compliance. This must be + * done separately. This function returns true if the name contains + * a magic character followed by excactly two characters from the + * basechars list (above), which in turn are followed either by the + * nul (end of string) byte or a dot (extension). + * + * ************************************************************************** ** + */ +BOOL is_mangled( char *s ) + { + char *magic; + + if( !ct_initialized ) + init_chartest(); + magic = strchr( s, magic_char ); + while( magic && magic[1] && magic[2] ) /* 3 chars, 1st is magic. */ + { + if( ('.' == magic[3] || !(magic[3])) /* Ends with '.' or nul? */ + && isbasechar( toupper(magic[1]) ) /* is 2nd char basechar? */ + && isbasechar( toupper(magic[2]) ) ) /* is 3rd char basechar? */ + return( True ); /* If all above, then true, */ + magic = strchr( magic+1, magic_char ); /* else seek next magic. */ + } + return( False ); + } /* is_mangled */ -/**************************************************************************** -return True if a name is in 8.3 dos format -****************************************************************************/ -BOOL is_8_3(char *fname, BOOL check_case) +/* ************************************************************************** ** + * Return True if the name is a valid DOS name in 8.3 DOS format. + * + * Input: fname - File name to be checked. + * check_case - If True, and if case_mangle is True, then the + * name will be checked to see if all characters + * are the correct case. See case_mangle and + * case_default above. + * + * Output: True if the name is a valid DOS name, else FALSE. + * + * ************************************************************************** ** + */ +BOOL is_8_3( char *fname, BOOL check_case ) { - int len; + int len; + int l; + int skip; + char *p; char *dot_pos; - char *slash_pos = strrchr(fname,'/'); - int l; + char *slash_pos = strrchr( fname, '/' ); + /* If there is a directory path, skip it. */ if( slash_pos ) - fname = slash_pos+1; - len = strlen(fname); + fname = slash_pos + 1; + len = strlen( fname ); + + DEBUG( 5, ( "Checking %s for 8.3\n", fname ) ); - DEBUG(5,("checking %s for 8.3\n",fname)); + /* Can't be 0 chars or longer than 12 chars */ + if( (len == 0) || (len > 12) ) + return( False ); + /* Mustn't be an MS-DOS Special file such as lpt1 or even lpt1.txt */ + if( is_reserved_msdos( fname ) ) + return( False ); + + /* Check that all characters are the correct case, if asked to do so. */ if( check_case && case_mangle ) { - switch (case_default) + switch( case_default ) { case CASE_LOWER: - if (strhasupper(fname)) return(False); + if( strhasupper( fname ) ) + return(False); break; case CASE_UPPER: - if (strhaslower(fname)) return(False); + if( strhaslower( fname ) ) + return(False); break; } } - /* can't be longer than 12 chars */ - if( len == 0 || len > 12 ) - return(False); - - /* can't be an MS-DOS Special file such as lpt1 or even lpt1.txt */ - if( is_reserved_msdos(fname) ) - return(False); - - /* can't contain invalid dos chars */ + /* Can't contain invalid dos chars */ /* Windows use the ANSI charset. But filenames are translated in the PC charset. This Translation may be more or less relaxed depending @@ -128,203 +367,283 @@ BOOL is_8_3(char *fname, BOOL check_case) /* %%% A nice improvment to name mangling would be to translate filename to ANSI charset on the smb server host */ - dot_pos = strchr(fname,'.'); - - { - char *p = fname; - int skip; - - dot_pos = 0; - while (*p) + p = fname; + dot_pos = NULL; + while( *p ) { - if((skip = skip_multibyte_char( *p )) != 0) - p += skip; - else + if( (skip = skip_multibyte_char( *p )) != 0 ) + p += skip; + else { - if (*p == '.' && !dot_pos) - dot_pos = (char *) p; - if (!isdoschar(*p)) - return(False); - p++; + if( *p == '.' && !dot_pos ) + dot_pos = (char *)p; + else + if( !isdoschar( *p ) ) + return( False ); + p++; } } - } /* no dot and less than 9 means OK */ - if (!dot_pos) - return(len <= 8); + if( !dot_pos ) + return( len <= 8 ); - l = PTR_DIFF(dot_pos,fname); + l = PTR_DIFF( dot_pos, fname ); /* base must be at least 1 char except special cases . and .. */ if( l == 0 ) - return(strcmp(fname,".") == 0 || strcmp(fname,"..") == 0); + return( 0 == strcmp( fname, "." ) || 0 == strcmp( fname, ".." ) ); /* base can't be greater than 8 */ if( l > 8 ) - return(False); + return( False ); - if( lp_strip_dot() && - len - l == 1 && - !strchr(dot_pos+1,'.') ) + /* see smb.conf(5) for a description of the 'strip dot' parameter. */ + if( lp_strip_dot() + && len - l == 1 + && !strchr( dot_pos + 1, '.' ) ) { *dot_pos = 0; - return(True); + return( True ); } /* extension must be between 1 and 3 */ if( (len - l < 2 ) || (len - l > 4) ) - return(False); + return( False ); - /* extension can't have a dot */ - if( strchr(dot_pos+1,'.') ) - return(False); + /* extensions may not have a dot */ + if( strchr( dot_pos+1, '.' ) ) + return( False ); /* must be in 8.3 format */ - return(True); + return( True ); } /* is_8_3 */ -/* -------------------------------------------------------------------------- ** - * This section creates and maintains a stack of name mangling results. - * The original comments read: "keep a stack of name mangling results - just - * so file moves and copies have a chance of working" (whatever that means). - * - * There are three functions to manage the stack: - * reset_mangled_stack() - - * push_mangled_name() - - * check_mangled_stack() - +/* ************************************************************************** ** + * Provide a checksum on a string + * + * Input: s - the nul-terminated character string for which the checksum + * will be calculated. + * + * Output: The checksum value calculated for s. + * + * ************************************************************************** ** */ - -fstring *mangled_stack = NULL; -int mangled_stack_size = 0; -int mangled_stack_len = 0; - -/**************************************************************************** - * create the mangled stack CRH - ****************************************************************************/ -void reset_mangled_stack( int size ) +int str_checksum( char *s ) { - if( mangled_stack ) + int res = 0; + int c; + int i=0; + + while( *s ) { - free(mangled_stack); - mangled_stack_size = 0; - mangled_stack_len = 0; + c = *s; + res ^= (c << (i % 15)) ^ (c >> (15-(i%15))); + s++; + i++; } + return(res); + } /* str_checksum */ + +/* ************************************************************************** ** + * Compare two cache keys and return a value indicating their ordinal + * relationship. + * + * Input: ItemPtr - Pointer to a comparison key. In this case, this will + * be a mangled name string. + * NodePtr - Pointer to a node in the cache. The node structure + * will be followed in memory by a mangled name string. + * + * Output: A signed integer, as follows: + * (x < 0) <==> Key1 less than Key2 + * (x == 0) <==> Key1 equals Key2 + * (x > 0) <==> Key1 greater than Key2 + * + * Notes: This is a ubiqx-style comparison routine. See ubi_BinTree for + * more info. + * + * ************************************************************************** ** + */ +static signed int cache_compare( ubi_btItemPtr ItemPtr, ubi_btNodePtr NodePtr ) + { + char *Key1 = (char *)ItemPtr; + char *Key2 = (char *)(((ubi_cacheEntryPtr)NodePtr) + 1); + + return( StrCaseCmp( Key1, Key2 ) ); + } /* cache_compare */ - if( size > 0 ) +/* ************************************************************************** ** + * Initializes or clears the mangled cache. + * + * Input: none. + * Output: none. + * + * Notes: There is a section below that is commented out. It shows how + * one might use lp_ calls to set the maximum memory and entry size + * of the cache. You might also want to remove the constants used + * in ubi_cacheInit() and replace them with lp_ calls. If so, then + * the calls to ubi_cacheSetMax*() would be moved into the else + * clause. Another option would be to pass in the max_entries and + * max_memory values as parameters. crh 09-Apr-1998. + * + * ************************************************************************** ** + */ +void reset_mangled_cache( void ) + { + if( !mc_initialized ) { - mangled_stack = (fstring *)malloc( sizeof(fstring) * size ); - if( mangled_stack ) - mangled_stack_size = size; + (void)ubi_cacheInit( mangled_cache, + cache_compare, + (ubi_trKillNodeRtn)free, + MANGLED_CACHE_MAX_ENTRIES, + MANGLED_CACHE_MAX_MEMORY ); + mc_initialized = True; } else - mangled_stack = NULL; - } /* create_mangled_stack */ + { + (void)ubi_cacheClear( mangled_cache ); + } -/**************************************************************************** - * push a mangled name onto the stack CRH - ****************************************************************************/ -static void push_mangled_name(char *s) - { - int i; - char *p; + /* + (void)ubi_cacheSetMaxEntries( mangled_cache, lp_mangled_cache_entries() ); + (void)ubi_cacheSetMaxMemory( mangled_cache, lp_mangled_cache_memory() ); + */ + } /* reset_mangled_cache */ - /* If the stack doesn't exist... Fail. */ - if( !mangled_stack ) + +/* ************************************************************************** ** + * Add a mangled name into the cache. + * + * Notes: If the mangled cache has not been initialized, then the + * function will simply fail. It could initialize the cache, + * but that's not the way it was done before I changed the + * cache mechanism, so I'm sticking with the old method. + * + * If the extension of the raw name maps directly to the + * extension of the mangled name, then we'll store both names + * *without* extensions. That way, we can provide consistant + * reverse mangling for all names that match. The test here is + * a bit more careful than the one done in earlier versions of + * mangle.c: + * + * - the extension must exist on the raw name, + * - it must be all lower case + * - it must match the mangled extension (to prove that no + * mangling occurred). + * + * crh 07-Apr-1998 + * + * ************************************************************************** ** + */ +static void cache_mangled_name( char *mangled_name, char *raw_name ) + { + ubi_cacheEntryPtr new_entry; + char *s1; + char *s2; + int mangled_len; + int raw_len; + int i; + + /* If the cache isn't initialized, give up. */ + if( !mc_initialized ) return; - /* If name <s> is already on the stack, move it to the top. */ - for( i=0; i<mangled_stack_len; i++ ) + /* Init the string lengths. */ + mangled_len = strlen( mangled_name ); + raw_len = strlen( raw_name ); + + /* See if the extensions are unmangled. If so, store the entry + * without the extension, thus creating a "group" reverse map. + */ + s1 = strrchr( mangled_name, '.' ); + if( s1 && (s2 = strrchr( raw_name, '.' )) ) { - if( strcmp( s, mangled_stack[i] ) == 0 ) + i = 1; + while( s1[i] && (tolower( s1[1] ) == s2[i]) ) + i++; + if( !s1[i] && !s2[i] ) { - array_promote( mangled_stack[0],sizeof(fstring), i ); - return; + mangled_len -= i; + raw_len -= i; } } - /* If name <s> wasn't already there, add it to the top of the stack. */ - memmove( mangled_stack[1], mangled_stack[0], - sizeof(fstring) * MIN(mangled_stack_len, mangled_stack_size-1) ); - strcpy( mangled_stack[0], s ); - mangled_stack_len = MIN( mangled_stack_size, mangled_stack_len+1 ); - - /* Hmmm... - * Find the last dot '.' in the name, - * if there are any upper case characters past the last dot - * and there are no more than three characters past the last dot - * then terminate the name *at* the last dot. - */ - p = strrchr( mangled_stack[0], '.' ); - if( p && (!strhasupper(p+1)) && (strlen(p+1) < (size_t)4) ) - *p = 0; + /* Allocate a new cache entry. If the allcoation fails, just return. */ + i = sizeof( ubi_cacheEntry ) + mangled_len + raw_len + 2; + new_entry = malloc( i ); + if( !new_entry ) + return; - } /* push_mangled_name */ + /* Fill the new cache entry, and add it to the cache. */ + s1 = (char *)(new_entry + 1); + s2 = (char *)&(s1[mangled_len + 1]); + (void)StrnCpy( s1, mangled_name, mangled_len ); + (void)StrnCpy( s2, raw_name, raw_len ); + ubi_cachePut( mangled_cache, i, new_entry, s1 ); + } /* cache_mangled_name */ -/**************************************************************************** - * check for a name on the mangled name stack CRH - ****************************************************************************/ -BOOL check_mangled_stack(char *s) +/* ************************************************************************** ** + * Check for a name on the mangled name stack + * + * Input: s - Input *and* output string buffer. + * + * Output: True if the name was found in the cache, else False. + * + * Notes: If a reverse map is found, the function will overwrite the string + * space indicated by the input pointer <s>. This is frightening. + * It should be rewritten to return NULL if the long name was not + * found, and a pointer to the long name if it was found. + * + * ************************************************************************** ** + */ +BOOL check_mangled_cache( char *s ) { - int i; - pstring tmpname; - char extension[5]; - char *p = strrchr( s, '.' ); - BOOL check_extension = False; - - extension[0] = 0; + ubi_cacheEntryPtr FoundPtr; + char *ext_start = NULL; + char *found_name; - /* If the stack doesn't exist, fail. */ - if( !mangled_stack ) - return(False); + /* If the cache isn't initialized, give up. */ + if( !mc_initialized ) + return( False ); - /* If there is a file extension, then we need to play with it, too. */ - if( p ) - { - check_extension = True; - StrnCpy( extension, p, 4 ); - strlower( extension ); /* XXXXXXX */ - } + FoundPtr = ubi_cacheGet( mangled_cache, (ubi_trItemPtr)s ); - for( i=0; i<mangled_stack_len; i++ ) + /* If we didn't find the name *with* the extension, try without. */ + if( !FoundPtr ) { - strcpy(tmpname,mangled_stack[i]); - mangle_name_83(tmpname); - if( strequal(tmpname,s) ) - { - strcpy(s,mangled_stack[i]); - break; - } - if( check_extension && !strchr(mangled_stack[i],'.') ) + ext_start = strrchr( s, '.' ); + if( ext_start ) { - pstrcpy(tmpname,mangled_stack[i]); - strcat(tmpname,extension); - mangle_name_83(tmpname); - if( strequal(tmpname,s) ) - { - strcpy(s,mangled_stack[i]); - strcat(s,extension); - break; - } + *ext_start = '\0'; + FoundPtr = ubi_cacheGet( mangled_cache, (ubi_trItemPtr)s ); + *ext_start = '.'; } } - if( i < mangled_stack_len ) - { - DEBUG(3,("Found %s on mangled stack as %s\n",s,mangled_stack[i])); - array_promote(mangled_stack[0],sizeof(fstring),i); - return(True); - } + /* Okay, if we haven't found it we're done. */ + if( !FoundPtr ) + return( False ); - return(False); - } /* check_mangled_stack */ + /* If we *did* find it, we need to copy it into the string buffer. */ + found_name = (char *)(FoundPtr + 1); + found_name += (strlen( found_name ) + 1); + DEBUG( 3, ("Found %s on mangled stack ", s) ); -/* End of the mangled stack section. - * -------------------------------------------------------------------------- ** - */ + (void)strcpy( s, found_name ); + if( ext_start ) + (void)strcat( s, ext_start ); + + DEBUG( 3, ("as %s\n", s) ); + return( True ); + } /* check_mangled_cache */ + +/* ************************************************************************** ** + * Used only in do_fwd_mangled_map(), below. + * ************************************************************************** ** + */ static char *map_filename( char *s, /* This is null terminated */ char *pattern, /* This isn't. */ int len ) /* This is the length of pattern. */ @@ -336,19 +655,19 @@ static char *map_filename( char *s, /* This is null terminated */ char *match_start; /* Where the matching bit starts. */ pstring pat; - StrnCpy(pat, pattern, len); /* Get pattern into a proper string! */ - pstrcpy(matching_bit,""); /* Match but no star gets this. */ - pp = pat; /* Initialise the pointers. */ + StrnCpy( pat, pattern, len ); /* Get pattern into a proper string! */ + pstrcpy( matching_bit, "" ); /* Match but no star gets this. */ + pp = pat; /* Initialize the pointers. */ sp = s; if( (len == 1) && (*pattern == '*') ) { return NULL; /* Impossible, too ambiguous for */ } /* words! */ - while ((*sp) /* Not the end of the string. */ - && (*pp) /* Not the end of the pattern. */ - && (*sp == *pp) /* The two match. */ - && (*pp != '*')) /* No wildcard. */ + while( (*sp) /* Not the end of the string. */ + && (*pp) /* Not the end of the pattern. */ + && (*sp == *pp) /* The two match. */ + && (*pp != '*') ) /* No wildcard. */ { sp++; /* Keep looking. */ pp++; @@ -357,14 +676,14 @@ static char *map_filename( char *s, /* This is null terminated */ if( !*sp && !*pp ) /* End of pattern. */ return( matching_bit ); /* Simple match. Return empty string. */ - if (*pp == '*') + if( *pp == '*' ) { pp++; /* Always interrested in the chacter */ /* after the '*' */ - if (!*pp) /* It is at the end of the pattern. */ + if( !*pp ) /* It is at the end of the pattern. */ { - StrnCpy(matching_bit, s, sp-s); - return matching_bit; + StrnCpy( matching_bit, s, sp-s ); + return( matching_bit ); } else { @@ -372,11 +691,11 @@ static char *map_filename( char *s, /* This is null terminated */ /* along s than sp so look for that character. */ match_start = sp; while( (*sp) /* Not the end of s. */ - && (*sp != *pp)) /* Not the same */ + && (*sp != *pp) ) /* Not the same */ sp++; /* Keep looking. */ - if (!*sp) /* Got to the end without a match. */ + if( !*sp ) /* Got to the end without a match. */ { - return NULL; + return( NULL ); } /* Still hope for a match. */ else { @@ -384,144 +703,116 @@ static char *map_filename( char *s, /* This is null terminated */ StrnCpy(matching_bit, match_start, sp-match_start); /* Back to needing a stright match again. */ while( (*sp) /* Not the end of the string. */ - && (*pp) /* Not the end of the pattern. */ - && (*sp == *pp) ) /* The two match. */ + && (*pp) /* Not the end of the pattern. */ + && (*sp == *pp) ) /* The two match. */ { sp++; /* Keep looking. */ pp++; } - if (!*sp && !*pp) /* Both at end so it matched */ - return matching_bit; + if( !*sp && !*pp ) /* Both at end so it matched */ + return( matching_bit ); else - return NULL; + return( NULL ); } } } - return NULL; /* No match. */ + return( NULL ); /* No match. */ } /* map_filename */ -/* this is the magic char used for mangling */ -char magic_char = '~'; - - -/**************************************************************************** -return True if the name could be a mangled name -****************************************************************************/ -BOOL is_mangled( char *s ) - { - char *m = strchr(s,magic_char); - - if( !m ) - return(False); - - /* we use two base 36 chars before the extension */ - if( m[1] == '.' || m[1] == 0 || - m[2] == '.' || m[2] == 0 || - (m[3] != '.' && m[3] != 0) ) - return( is_mangled(m+1) ); - - /* it could be */ - return(True); - } /* is_mangled */ - - - -/**************************************************************************** -return a base 36 character. v must be from 0 to 35. -****************************************************************************/ -static char base36(unsigned int v) - { - static char basechars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - return basechars[v % 36]; - } /* base36 */ - - +/* ************************************************************************** ** + * MangledMap is a series of name pairs in () separated by spaces. + * If s matches the first of the pair then the name given is the + * second of the pair. A * means any number of any character and if + * present in the second of the pair as well as the first the + * matching part of the first string takes the place of the * in the + * second. + * + * I wanted this so that we could have RCS files which can be used + * by UNIX and DOS programs. My mapping string is (RCS rcs) which + * converts the UNIX RCS file subdirectory to lowercase thus + * preventing mangling. + * + * (I think Andrew wrote the above, but I'm not sure. -- CRH) + * + * See 'mangled map' in smb.conf(5). + * + * ************************************************************************** ** + */ static void do_fwd_mangled_map(char *s, char *MangledMap) { - /* MangledMap is a series of name pairs in () separated by spaces. - * If s matches the first of the pair then the name given is the - * second of the pair. A * means any number of any character and if - * present in the second of the pair as well as the first the - * matching part of the first string takes the place of the * in the - * second. - * - * I wanted this so that we could have RCS files which can be used - * by UNIX and DOS programs. My mapping string is (RCS rcs) which - * converts the UNIX RCS file subdirectory to lowercase thus - * preventing mangling. - */ char *start=MangledMap; /* Use this to search for mappings. */ char *end; /* Used to find the end of strings. */ char *match_string; pstring new_string; /* Make up the result here. */ char *np; /* Points into new_string. */ - DEBUG(5,("Mangled Mapping '%s' map '%s'\n", s, MangledMap)); - while (*start) + DEBUG( 5, ("Mangled Mapping '%s' map '%s'\n", s, MangledMap) ); + while( *start ) { - while ((*start) && (*start != '(')) + while( (*start) && (*start != '(') ) start++; - if (!*start) + if( !*start ) continue; /* Always check for the end. */ start++; /* Skip the ( */ end = start; /* Search for the ' ' or a ')' */ - DEBUG(5,("Start of first in pair '%s'\n", start)); - while ((*end) && !((*end == ' ') || (*end == ')'))) + DEBUG( 5, ("Start of first in pair '%s'\n", start) ); + while( (*end) && !((*end == ' ') || (*end == ')')) ) end++; - if (!*end) + if( !*end ) { start = end; continue; /* Always check for the end. */ } - DEBUG(5,("End of first in pair '%s'\n", end)); - if ((match_string = map_filename(s, start, end-start))) + DEBUG( 5, ("End of first in pair '%s'\n", end) ); + if( (match_string = map_filename( s, start, end-start )) ) { - DEBUG(5,("Found a match\n")); + DEBUG( 5, ("Found a match\n") ); /* Found a match. */ - start = end+1; /* Point to start of what it is to become. */ - DEBUG(5,("Start of second in pair '%s'\n", start)); + start = end + 1; /* Point to start of what it is to become. */ + DEBUG( 5, ("Start of second in pair '%s'\n", start) ); end = start; np = new_string; - while ((*end) /* Not the end of string. */ - && (*end != ')') /* Not the end of the pattern. */ - && (*end != '*')) /* Not a wildcard. */ + while( (*end) /* Not the end of string. */ + && (*end != ')') /* Not the end of the pattern. */ + && (*end != '*') ) /* Not a wildcard. */ *np++ = *end++; - if (!*end) + if( !*end ) { start = end; continue; /* Always check for the end. */ } - if (*end == '*') + if( *end == '*' ) { - pstrcpy(np, match_string); - np += strlen(match_string); + pstrcpy( np, match_string ); + np += strlen( match_string ); end++; /* Skip the '*' */ - while ((*end) /* Not the end of string. */ - && (*end != ')') /* Not the end of the pattern. */ - && (*end != '*')) /* Not a wildcard. */ + while( (*end) /* Not the end of string. */ + && (*end != ')') /* Not the end of the pattern. */ + && (*end != '*') ) /* Not a wildcard. */ *np++ = *end++; } - if (!*end) + if( !*end ) { start = end; continue; /* Always check for the end. */ } *np++ = '\0'; /* NULL terminate it. */ DEBUG(5,("End of second in pair '%s'\n", end)); - pstrcpy(s, new_string); /* Substitute with the new name. */ - DEBUG(5,("s is now '%s'\n", s)); + pstrcpy( s, new_string ); /* Substitute with the new name. */ + DEBUG( 5, ("s is now '%s'\n", s) ); } - start = end; /* Skip a bit which cannot be wanted */ - /* anymore. */ + start = end; /* Skip a bit which cannot be wanted anymore. */ start++; } } /* do_fwd_mangled_map */ -/**************************************************************************** -do the actual mangling to 8.3 format -****************************************************************************/ -void mangle_name_83(char *s) +/* ************************************************************************** ** + * do the actual mangling to 8.3 format + * + * ************************************************************************** ** + */ +void mangle_name_83( char *s ) { int csum = str_checksum(s); char *p; @@ -531,59 +822,59 @@ void mangle_name_83(char *s) int extlen = 0; int skip; - extension[0]=0; - base[0]=0; + extension[0] = 0; + base[0] = 0; p = strrchr(s,'.'); if( p && (strlen(p+1) < (size_t)4) ) { - BOOL all_normal = (strisnormal(p+1)); /* XXXXXXXXX */ + BOOL all_normal = ( strisnormal(p+1) ); /* XXXXXXXXX */ - if (all_normal && p[1] != 0) + if( all_normal && p[1] != 0 ) { *p = 0; - csum = str_checksum(s); - *p = '.'; + csum = str_checksum( s ); + *p = '.'; } } - strupper(s); + strupper( s ); - DEBUG(5,("Mangling name %s to ",s)); + DEBUG( 5, ("Mangling name %s to ",s) ); if( p ) { - if (p == s) - strcpy(extension,"___"); + if( p == s ) + strcpy( extension, "___" ); else { *p++ = 0; - while (*p && extlen < 3) + while( *p && extlen < 3 ) { - skip = skip_multibyte_char(*p); - if (skip == 2) + skip = skip_multibyte_char( *p ); + switch( skip ) { - if (extlen < 2) - { + case 2: + if( extlen < 2 ) + { + extension[extlen++] = p[0]; + extension[extlen++] = p[1]; + } + else + { + extension[extlen++] = base36( (unsigned char)*p ); + } + p += 2; + break; + case 1: extension[extlen++] = p[0]; - extension[extlen++] = p[1]; - } - else - { - extension[extlen++] = base36 (((unsigned char) *p) % 36); - } - p += 2; - } - else if( skip == 1 ) - { - extension[extlen++] = p[0]; - p++; - } - else - { - if (isdoschar (*p) && *p != '.') - extension[extlen++] = p[0]; - p++; + p++; + break; + default: + if( isdoschar (*p) && *p != '.' ) + extension[extlen++] = p[0]; + p++; + break; } } extension[extlen] = 0; @@ -592,117 +883,111 @@ void mangle_name_83(char *s) p = s; - while (*p && baselen < 5) + while( *p && baselen < 5 ) { - skip = skip_multibyte_char(*p); - if (skip == 2) - { - if (baselen < 4) + skip = skip_multibyte_char(*p); + switch( skip ) + { + case 2: + if( baselen < 4 ) { base[baselen++] = p[0]; base[baselen++] = p[1]; } else { - base[baselen++] = base36 (((unsigned char) *p) % 36); + base[baselen++] = base36( (unsigned char)*p ); } p += 2; - } - else if( skip == 1) - { + break; + case 1: base[baselen++] = p[0]; p++; - } - else - { - if (isdoschar (*p) && *p != '.') + break; + default: + if( isdoschar( *p ) && *p != '.' ) base[baselen++] = p[0]; p++; - } + break; + } } base[baselen] = 0; csum = csum % (36*36); - sprintf(s,"%s%c%c%c",base,magic_char,base36(csum/36),base36(csum%36)); + (void)sprintf( s, "%s%c%c%c", + base, magic_char, base36( csum/36 ), base36( csum ) ); if( *extension ) { - strcat(s,"."); - strcat(s,extension); + (void)strcat( s, "." ); + (void)strcat( s, extension ); } - DEBUG(5,("%s\n",s)); + DEBUG( 5, ( "%s\n", s ) ); } /* mangle_name_83 */ - - -/******************************************************************* - work out if a name is illegal, even for long names - ******************************************************************/ -static BOOL illegal_name(char *name) +/* ************************************************************************** ** + * Convert a filename to DOS format. Return True if successful. + * + * Input: OutName - Source *and* destination buffer. + * + * NOTE that OutName must point to a memory space that + * is at least 13 bytes in size! + * + * need83 - If False, name mangling will be skipped unless the + * name contains illegal characters. Mapping will still + * be done, if appropriate. This is probably used to + * signal that a client does not require name mangling, + * thus skipping the name mangling even on shares which + * have name-mangling turned on. + * snum - Share number. This identifies the share in which the + * name exists. + * + * Output: Returns False only if the name wanted mangling but the share does + * not have name mangling turned on. + * + * ************************************************************************** ** + */ +BOOL name_map_mangle( char *OutName, BOOL need83, int snum ) { - static unsigned char illegal[256]; - static BOOL initialised=False; - unsigned char *s; - int skip; - - if( !initialised ) - { - char *ill = "*\\/?<>|\":"; - initialised = True; - - bzero((char *)illegal,256); - for( s = (unsigned char *)ill; *s; s++ ) - illegal[*s] = True; - } - - for (s = (unsigned char *)name; *s;) - { - skip = skip_multibyte_char( *s ); - if (skip != 0) - s += skip; - else - { - if (illegal[*s]) - return(True); - else - s++; - } - } - - return(False); - } /* illegal_name */ + DEBUG(5, + ("name_map_mangle( %s, %s, %d )\n", OutName, need83?"TRUE":"FALSE", snum) ); - -/**************************************************************************** -convert a filename to DOS format. return True if successful. -****************************************************************************/ -BOOL name_map_mangle(char *OutName,BOOL need83,int snum) - { #ifdef MANGLE_LONG_FILENAMES - if( !need83 && illegal_name(OutName) ) + if( !need83 && is_illegal_name(OutName) ) need83 = True; #endif /* apply any name mappings */ { - char *map = lp_mangled_map(snum); + char *map = lp_mangled_map( snum ); - if (map && *map) - do_fwd_mangled_map(OutName,map); + if( map && *map ) + do_fwd_mangled_map( OutName, map ); } /* check if it's already in 8.3 format */ - if( need83 && !is_8_3(OutName, True) ) + if( need83 && !is_8_3( OutName, True ) ) { - if( !lp_manglednames(snum) ) - return(False); + char *tmp; /* kludge -- mangle_name_83() overwrites the source string */ + /* but cache_mangled_name() needs both. crh 09-Apr-1998 */ + + if( !lp_manglednames( snum ) ) + return( False ); /* mangle it into 8.3 */ - push_mangled_name(OutName); - mangle_name_83(OutName); + tmp = strdup( OutName ); + mangle_name_83( OutName ); + if( tmp ) + { + cache_mangled_name( OutName, tmp ); + free( tmp ); + } } - - return(True); + + DEBUG( 5, ("name_map_mangle() ==> [%s]\n", OutName) ); + return( True ); } /* name_map_mangle */ + +/* ========================================================================== */ diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index d4ee8223ad..7807bf8369 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1675,7 +1675,7 @@ int reply_unlink(char *inbuf,char *outbuf, int dum_size, int dum_buffsize) } if (is_mangled(mask)) - check_mangled_stack(mask); + check_mangled_cache( mask ); has_wild = strchr(mask,'*') || strchr(mask,'?'); @@ -3142,7 +3142,7 @@ int reply_mv(char *inbuf,char *outbuf, int dum_size, int dum_buffsize) } if (is_mangled(mask)) - check_mangled_stack(mask); + check_mangled_cache( mask ); has_wild = strchr(mask,'*') || strchr(mask,'?'); @@ -3412,7 +3412,7 @@ int reply_copy(char *inbuf,char *outbuf, int dum_size, int dum_buffsize) } if (is_mangled(mask)) - check_mangled_stack(mask); + check_mangled_cache( mask ); has_wild = strchr(mask,'*') || strchr(mask,'?'); diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 7216ae79bb..c4db553659 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -464,7 +464,7 @@ static BOOL scan_directory(char *path, char *name,int cnum,BOOL docache) * (JRA). */ if (mangled) - mangled = !check_mangled_stack(name); + mangled = !check_mangled_cache( name ); /* open the directory */ if (!(cur_dir = OpenDir(cnum, path, True))) @@ -659,7 +659,7 @@ BOOL unix_convert(char *name,int cnum,pstring saved_last_component, BOOL *bad_pa /* check on the mangled stack to see if we can recover the base of the filename */ if (is_mangled(start)) - check_mangled_stack(start); + check_mangled_cache( start ); DEBUG(5,("New file %s\n",start)); return(True); @@ -3305,7 +3305,7 @@ BOOL reload_services(BOOL test) } } - reset_mangled_stack( lp_mangledstack() ); + reset_mangled_cache(); /* this forces service parameters to be flushed */ become_service(-1,True); |