summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/include/smb.h10
-rw-r--r--source3/include/smb_macros.h1
-rw-r--r--source3/lib/charcnv.c8
-rw-r--r--source3/lib/util.c68
-rw-r--r--source3/lib/util_str.c67
-rw-r--r--source3/lib/util_unistr.c205
-rw-r--r--source3/smbd/mangle.c1333
7 files changed, 579 insertions, 1113 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 33a33037a8..1cf315c387 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -383,6 +383,16 @@ typedef struct write_cache
char *data;
} write_cache;
+typedef struct
+{
+ smb_ucs2_t *path;
+ smb_ucs2_t *name;
+ smb_ucs2_t *unixname;
+ smb_ucs2_t *dosname;
+ SMB_STRUCT_STAT *statinfo;
+} smb_filename;
+
+
typedef struct files_struct
{
struct files_struct *next, *prev;
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 05a358573d..9978a0faa0 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -216,6 +216,7 @@ copy an IP address from one buffer to another
****************************************************************************/
#define unix_format(fname) string_replace(fname,'\\','/')
+#define unix_format_w(fname) string_replace_w(fname, UCS2_CHAR('\\'), UCS2_CHAR('/'))
/****************************************************************************
Make a file into DOS format.
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index e55de729c2..ebf316d9dd 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -123,7 +123,13 @@ size_t convert_string(charset_t from, charset_t to,
{ case EINVAL: reason="Incomplete multibyte sequence"; break;
case E2BIG: reason="No more room";
DEBUG(0, ("Required %d, available %d\n",
- srclen, destlen));
+ srclen, destlen));
+ /* we are not sure we need srclen bytes,
+ may be more, may be less.
+ We only know we need more than destlen
+ bytes ---simo */
+
+
break;
case EILSEQ: reason="Illegal myltibyte sequence"; break;
}
diff --git a/source3/lib/util.c b/source3/lib/util.c
index c833707d62..e2a5fe10d0 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -418,6 +418,58 @@ void unix_clean_name(char *s)
trim_string(s,NULL,"/..");
}
+/*******************************************************************
+convert '\' to '/'
+reduce a file name, removing or reducing /../ , /./ , // elements.
+remove also any trailing . and /
+return a new allocated string.
+********************************************************************/
+smb_ucs2_t *unix_clean_path(const smb_ucs2_t *s)
+{
+ smb_ucs2_t *ns;
+ smb_ucs2_t *p, *r, *t;
+
+ DEBUG(3, ("unix_clean_name_w\n")); /* [%unicode]\n")); */
+
+ /* convert '\' to '/' */
+ ns = strdup_w(s);
+ if (!ns) return NULL;
+ unix_format_w(ns);
+
+ /* remove all double slashes */
+ p = ns;
+ ns = all_string_sub_wa(p, "//", "/");
+ SAFE_FREE(p);
+ if (!ns) return NULL;
+
+ /* remove any /./ */
+ p = ns;
+ ns = all_string_sub_wa(p, "/./", "/");
+ SAFE_FREE(p);
+ if (!ns) return NULL;
+
+ /* reduce any /../ */
+ t = ns;
+ while ((r = strstr_wa(t, "/..")) != NULL) {
+ t = &(r[3]);
+ if (*t == UCS2_CHAR('/') || *t == 0) {
+ *r = 0;
+ p = strrchr_w(ns, UCS2_CHAR('/'));
+ if (!p) p = ns;
+ memmove(p, t, (strlen_w(t) + 1) * sizeof(smb_ucs2_t));
+ t = p;
+ }
+ }
+
+ /* remove any trailing /. */
+ trim_string_wa(ns, NULL, "/.");
+
+ /* remove any leading and trailing / */
+ trim_string_wa(ns, "/", "/");
+
+ return ns;
+}
+
/****************************************************************************
make a dir struct
****************************************************************************/
@@ -1783,6 +1835,22 @@ BOOL ms_has_wild(char *s)
return False;
}
+BOOL ms_has_wild_w(const smb_ucs2_t *s)
+{
+ smb_ucs2_t c;
+ while ((c = *s++)) {
+ switch (c) {
+ case UCS2_CHAR('*'):
+ case UCS2_CHAR('?'):
+ case UCS2_CHAR('<'):
+ case UCS2_CHAR('>'):
+ case UCS2_CHAR('"'):
+ return True;
+ }
+ }
+ return False;
+}
+
/*******************************************************************
a wrapper that handles case sensitivity and the special handling
of the ".." name
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index e97885ae05..dc9dbd8ed7 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -245,9 +245,7 @@ void string_replace(char *s,char oldc,char newc)
{
smb_ucs2_t *ptr;
push_ucs2(NULL, tmpbuf,s, sizeof(tmpbuf), STR_TERMINATE);
- for(ptr=tmpbuf;*ptr;ptr++) {
- if(*ptr==UCS2_CHAR(oldc)) *ptr = UCS2_CHAR(newc);
- }
+ string_replace_w(tmpbuf, UCS2_CHAR(oldc), UCS2_CHAR(newc));
pull_ucs2(NULL, s, tmpbuf, -1, sizeof(tmpbuf), STR_TERMINATE);
}
@@ -744,6 +742,65 @@ void all_string_sub(char *s,const char *pattern,const char *insert, size_t len)
}
/****************************************************************************
+similar to all_string_sub but for unicode strings.
+return a new allocate unicode string.
+len is the number of bytes, not chars
+ similar to string_sub() but allows for any character to be substituted.
+ Use with caution!
+ if len==0 then no length check is performed
+****************************************************************************/
+
+smb_ucs2_t *all_string_sub_w(smb_ucs2_t *s, const smb_ucs2_t *pattern,
+ const smb_ucs2_t *insert)
+{
+ smb_ucs2_t *r, *rp, *sp;
+ size_t ls, lp, li, lt;
+
+ if (!insert || !pattern || !*pattern || !s) return NULL;
+
+ ls = lt = (size_t)strlen_w(s) * sizeof(smb_ucs2_t);
+ lp = (size_t)strlen_w(pattern) * sizeof(smb_ucs2_t);
+ li = (size_t)strlen_w(insert) * sizeof(smb_ucs2_t);
+
+ if (li > lp) {
+ smb_ucs2_t *st = s;
+ int ld = li - lp;
+ while (sp = strstr_w(st, pattern)) {
+ st = sp + lp;
+ lt += ld;
+ }
+ }
+
+ r = rp = (smb_ucs2_t *)malloc((lt + 1)*(sizeof(smb_ucs2_t)));
+ if (!r) {
+ DEBUG(0, ("all_string_sub_w: out of memory!\n"));
+ return NULL;
+ }
+
+ while (sp = strstr_w(s, pattern)) {
+ memcpy(rp, s, sp - s);
+ rp += (sp - s);
+ memcpy(rp, insert, li);
+ s = sp + lp;
+ rp += li;
+ }
+ *rp = 0;
+
+ return r;
+}
+
+smb_ucs2_t *all_string_sub_wa(smb_ucs2_t *s, const char *pattern,
+ const char *insert)
+{
+ wpstring p, i;
+
+ if (!insert || !pattern || !s) return NULL;
+ push_ucs2(NULL, p, pattern, sizeof(wpstring) - 1, STR_TERMINATE);
+ push_ucs2(NULL, i, insert, sizeof(wpstring) - 1, STR_TERMINATE);
+ return all_string_sub_w(s, p, i);
+}
+
+/****************************************************************************
splits out the front and back at a separator.
****************************************************************************/
void split_at_last_component(char *path, char *front, char sep, char *back)
@@ -813,7 +870,7 @@ char *strchr_m(const char *s, char c)
smb_ucs2_t *p;
push_ucs2(NULL, ws, s, sizeof(ws), STR_TERMINATE);
- p = strchr_wa(ws, c);
+ p = strchr_w(ws, UCS2_CHAR(c));
if (!p) return NULL;
*p = 0;
pull_ucs2_pstring(s2, ws);
@@ -827,7 +884,7 @@ char *strrchr_m(const char *s, char c)
smb_ucs2_t *p;
push_ucs2(NULL, ws, s, sizeof(ws), STR_TERMINATE);
- p = strrchr_wa(ws, c);
+ p = strrchr_w(ws, UCS2_CHAR(c));
if (!p) return NULL;
*p = 0;
pull_ucs2_pstring(s2, ws);
diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index d0e2a119b8..287472ad65 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -242,6 +242,52 @@ smb_ucs2_t *strchr_w(const smb_ucs2_t *s, smb_ucs2_t c)
return NULL;
}
+smb_ucs2_t *strrchr_w(const smb_ucs2_t *s, smb_ucs2_t c)
+{
+ const smb_ucs2_t *p = s;
+ int len = strlen_w(s);
+ if (len == 0) return NULL;
+ p += (len - 1);
+ do {
+ if (c == *p) return (smb_ucs2_t *)p;
+ } while (p-- != s);
+ return NULL;
+}
+
+/*******************************************************************
+wide strstr()
+********************************************************************/
+smb_ucs2_t *strstr_w(const smb_ucs2_t *s, const smb_ucs2_t *ins)
+{
+ smb_ucs2_t *r;
+ size_t slen, inslen;
+
+ if (!s || !*s || !ins || !*ins) return NULL;
+ slen = strlen_w(s);
+ inslen = strlen_w(ins);
+ r = (smb_ucs2_t *)s;
+ while (r = strchr_w(r, *ins)) {
+ if (strncmp_w(r, ins, inslen) == 0) return r;
+ r++;
+ }
+ return NULL;
+}
+
+smb_ucs2_t *strstr_wa(const smb_ucs2_t *s, const char *ins)
+{
+ smb_ucs2_t *r;
+ size_t slen, inslen;
+
+ if (!s || !*s || !ins || !*ins) return NULL;
+ slen = strlen_w(s);
+ inslen = strlen(ins);
+ r = (smb_ucs2_t *)s;
+ while (r = strchr_w(r, UCS2_CHAR(*ins))) {
+ if (strncmp_wa(r, ins, inslen) == 0) return r;
+ r++;
+ }
+ return NULL;
+}
/*******************************************************************
Convert a string to lower case.
@@ -280,6 +326,18 @@ BOOL strupper_w(smb_ucs2_t *s)
}
/*******************************************************************
+ convert a string to "normal" form
+********************************************************************/
+void strnorm_w(smb_ucs2_t *s)
+{
+ extern int case_default;
+ if (case_default == CASE_UPPER)
+ strupper_w(s);
+ else
+ strlower_w(s);
+}
+
+/*******************************************************************
case insensitive string comparison
********************************************************************/
int strcasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b)
@@ -288,23 +346,60 @@ int strcasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b)
return (tolower_w(*a) - tolower_w(*b));
}
+/*******************************************************************
+case insensitive string comparison, lenght limited
+********************************************************************/
+int strncasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len)
+{
+ size_t n = 0;
+ while ((n < len) && *b && (toupper_w(*a) == toupper_w(*b))) { a++; b++; n++; }
+ return (len - n)?(tolower_w(*a) - tolower_w(*b)):0;
+}
+
+/*******************************************************************
+ compare 2 strings
+********************************************************************/
+BOOL strequal_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2)
+{
+ if (s1 == s2) return(True);
+ if (!s1 || !s2) return(False);
+
+ return(strcasecmp_w(s1,s2)==0);
+}
+
+/*******************************************************************
+ compare 2 strings up to and including the nth char.
+ ******************************************************************/
+BOOL strnequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2,size_t n)
+{
+ if (s1 == s2) return(True);
+ if (!s1 || !s2 || !n) return(False);
+
+ return(strncasecmp_w(s1,s2,n)==0);
+}
/*******************************************************************
duplicate string
********************************************************************/
smb_ucs2_t *strdup_w(const smb_ucs2_t *src)
{
+ return strndup_w(src, 0);
+}
+
+/* if len == 0 then duplicate the whole string */
+smb_ucs2_t *strndup_w(const smb_ucs2_t *src, size_t len)
+{
smb_ucs2_t *dest;
- uint32 len;
- len = strlen_w(src) + 1;
- dest = (smb_ucs2_t *)malloc(len*sizeof(smb_ucs2_t));
+ if (!len) len = strlen_w(src);
+ dest = (smb_ucs2_t *)malloc((len + 1) * sizeof(smb_ucs2_t));
if (!dest) {
DEBUG(0,("strdup_w: out of memory!\n"));
return NULL;
}
- memcpy(dest, src, len*sizeof(smb_ucs2_t));
+ memcpy(dest, src, len * sizeof(smb_ucs2_t));
+ dest[len] = 0;
return dest;
}
@@ -368,33 +463,33 @@ void pstrcpy_wa(smb_ucs2_t *dest, const char *src)
}
}
-int strcmp_wa(const smb_ucs2_t *a, const char *b)
+int strcmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b)
{
- while (*b && *a == UCS2_CHAR(*b)) { a++; b++; }
- return (*a - UCS2_CHAR(*b));
+ while (*b && *a == *b) { a++; b++; }
+ return (*a - *b);
+ /* warning: if *a != *b and both are not 0 we retrun a random
+ greater or lesser than 0 number not realted to which
+ string is longer */
}
+int strncmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len)
+{
+ size_t n = 0;
+ while ((n < len) && *b && *a == *b) { a++; b++; n++;}
+ return (len - n)?(*a - *b):0;
+}
-
-smb_ucs2_t *strchr_wa(const smb_ucs2_t *s, char c)
+int strcmp_wa(const smb_ucs2_t *a, const char *b)
{
- while (*s != 0) {
- if (UCS2_CHAR(c) == *s) return (smb_ucs2_t *)s;
- s++;
- }
- return NULL;
+ while (*b && *a == UCS2_CHAR(*b)) { a++; b++; }
+ return (*a - UCS2_CHAR(*b));
}
-smb_ucs2_t *strrchr_wa(const smb_ucs2_t *s, char c)
+int strncmp_wa(const smb_ucs2_t *a, const char *b, size_t len)
{
- const smb_ucs2_t *p = s;
- int len = strlen_w(s);
- if (len == 0) return NULL;
- p += (len-1);
- do {
- if (UCS2_CHAR(c) == *p) return (smb_ucs2_t *)p;
- } while (p-- != s);
- return NULL;
+ size_t n = 0;
+ while ((n < len) && *b && *a == UCS2_CHAR(*b)) { a++; b++; n++;}
+ return (len - n)?(*a - UCS2_CHAR(*b)):0;
}
smb_ucs2_t *strpbrk_wa(const smb_ucs2_t *s, const char *p)
@@ -452,3 +547,67 @@ smb_ucs2_t *strncat_wa(smb_ucs2_t *dest, const char *src, const size_t max)
SAFE_FREE(ucs2_src);
return dest;
}
+
+/*******************************************************************
+replace any occurence of oldc with newc in unicode string
+********************************************************************/
+
+void string_replace_w(smb_ucs2_t *s, smb_ucs2_t oldc, smb_ucs2_t newc)
+{
+ for(;*s;s++) {
+ if(*s==oldc) *s=newc;
+ }
+}
+
+/*******************************************************************
+trim unicode string
+********************************************************************/
+
+BOOL trim_string_w(smb_ucs2_t *s, const smb_ucs2_t *front,
+ const smb_ucs2_t *back)
+{
+ BOOL ret = False;
+ size_t len, lw, front_len, flw, back_len, blw;
+
+ if (!s || !*s) return False;
+
+ len = strlen_w(s);
+
+ if (front && *front) {
+ front_len = strlen_w(front);
+ flw = front_len * sizeof(smb_ucs2_t);
+ lw = (len + 1) * sizeof(smb_ucs2_t);
+ while (len && strncmp_w(s, front, front_len) == 0) {
+ memcpy(s, s + flw, lw - flw);
+ len -= front_len;
+ lw -= flw;
+ ret = True;
+ }
+ }
+
+ if (back && *back) {
+ back_len = strlen_w(back);
+ blw = back_len * sizeof(smb_ucs2_t);
+ lw = len * sizeof(smb_ucs2_t);
+ while (len && strncmp_w(s + lw - blw, back, back_len) == 0) {
+ s[len - back_len] = 0;
+ len -= back_len;
+ lw -= blw;
+ ret = True;
+ }
+ }
+
+ return ret;
+}
+
+BOOL trim_string_wa(smb_ucs2_t *s, const char *front,
+ const char *back)
+{
+ wpstring f, b;
+
+ if (front) push_ucs2(NULL, f, front, sizeof(wpstring) - 1, STR_TERMINATE);
+ else *f = 0;
+ if (back) push_ucs2(NULL, b, back, sizeof(wpstring) - 1, STR_TERMINATE);
+ else *b = 0;
+ return trim_string_w(s, f, b);
+}
diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index 5c737ea656..cf2964790e 100644
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -1,8 +1,8 @@
/*
Unix SMB/Netbios implementation.
- Version 1.9.
- Name mangling
- Copyright (C) Andrew Tridgell 1992-1998
+ Version 3.0
+ Name mangling with persistent tdb
+ Copyright (C) Simo Sorce 2001
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,31 +19,9 @@
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.
- * -------------------------------------------------------------------------- **
- */
+/****************************************************************************
+ Rewritten from scrach in 2001 by Simo Sorce <idra@samba.org>
+ ****************************************************************************/
#include "includes.h"
@@ -55,951 +33,9 @@
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...
- *
- * 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.
- *
- * MANGLE_BASE - This is the number of characters we use for name mangling.
- *
- * basechars - The set characters used for name mangling. This
- * is static (scope is this file only).
- *
- * mangle() - Macro used to select a character from basechars (i.e.,
- * mangle(n) will return the nth digit, modulo MANGLE_BASE).
- *
- * 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_m().
- *
- * 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_m().
- *
- * 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 = '~';
-
-#if 0
-
-
-
-
-
-static char basechars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_-!@#$%";
-#define MANGLE_BASE ( (sizeof(basechars)/sizeof(char)) - 1 )
-
-static unsigned char chartest[256] = { 0 };
-static BOOL ct_initialized = False;
-
-#define mangle(V) ((char)(basechars[(V) % MANGLE_BASE]))
-#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, 0, 0, 0 }, 0, 0, 0, 0, 0, 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 )
- {
- char *illegalchars = "*\\/?<>|\":";
- unsigned char *s;
-
- memset( (char *)chartest, '\0', 256 );
-
- for( s = (unsigned char *)illegalchars; *s; s++ )
- chartest[*s] = ILLEGAL_MASK;
-
- for( s = (unsigned char *)basechars; *s; s++ )
- chartest[*s] |= BASECHAR_MASK;
-
- 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;
-
- StrnCpy (upperFname, fname, 12);
-
- /* lpt1.txt and con.txt etc are also illegal */
- p = strchr_m(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;
-
- if( !name )
- return( True );
-
- if( !ct_initialized )
- init_chartest();
-
- s = (unsigned char *)name;
- while( *s )
- {
- if( *s>0x7F && isillegal( *s ) )
- return( True );
- else
- s++;
- }
-
- return( False );
- } /* is_illegal_name */
-
-/* ************************************************************************** **
- * Return True if the name *could be* a mangled name.
- *
- * Input: s - A path name - in UNIX pathname format.
- *
- * 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) or by a '/' (end of
- * a directory name).
- *
- * ************************************************************************** **
- */
-BOOL is_mangled( char *s )
- {
- char *magic;
-
- if( !ct_initialized )
- init_chartest();
-
- magic = strchr_m( s, magic_char );
- while( magic && magic[1] && magic[2] ) /* 3 chars, 1st is magic. */
- {
- if( ('.' == magic[3] || '/' == magic[3] || !(magic[3])) /* Ends with '.' or nul or '/' ? */
- && 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_m( magic+1, magic_char ); /* else seek next magic. */
- }
- return( False );
- } /* is_mangled */
-
-/* ************************************************************************** **
- * 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 l;
- char *p;
- char *dot_pos;
- char *slash_pos = strrchr_m( fname, '/' );
-
- /* If there is a directory path, skip it. */
- if( slash_pos )
- fname = slash_pos + 1;
- len = strlen( 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 )
- {
- case CASE_LOWER:
- if( strhasupper( fname ) )
- return(False);
- break;
- case CASE_UPPER:
- if( strhaslower( fname ) )
- return(False);
- break;
- }
- }
-
- /* 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
- the Windows application. */
-
- /* %%% A nice improvment to name mangling would be to translate
- filename to ANSI charset on the smb server host */
-
- p = fname;
- dot_pos = NULL;
- while( *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 );
-
- l = PTR_DIFF( dot_pos, fname );
-
- /* base must be at least 1 char except special cases . and .. */
- if( l == 0 )
- return( 0 == strcmp( fname, "." ) || 0 == strcmp( fname, ".." ) );
-
- /* base can't be greater than 8 */
- if( l > 8 )
- return( False );
-
- /* see smb.conf(5) for a description of the 'strip dot' parameter. */
- if( lp_strip_dot()
- && len - l == 1
- && !strchr_m( dot_pos + 1, '.' ) )
- {
- *dot_pos = 0;
- return( True );
- }
-
- /* extension must be between 1 and 3 */
- if( (len - l < 2 ) || (len - l > 4) )
- return( False );
-
- /* extensions may not have a dot */
- if( strchr_m( dot_pos+1, '.' ) )
- return( False );
-
- /* must be in 8.3 format */
- return( True );
- } /* is_8_3 */
-
-
-/* ************************************************************************** **
- * 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 */
-
-/* ************************************************************************** **
- * Free a cache entry.
- *
- * Input: WarrenZevon - Pointer to the entry that is to be returned to
- * Nirvana.
- * Output: none.
- *
- * Notes: This function gets around the possibility that the standard
- * free() function may be implemented as a macro, or other evil
- * subversions (oh, so much fun).
- *
- * ************************************************************************** **
- */
-static void cache_free_entry( ubi_trNodePtr WarrenZevon )
- {
- ZERO_STRUCTP(WarrenZevon);
- SAFE_FREE( WarrenZevon );
- } /* cache_free_entry */
-
-/* ************************************************************************** **
- * 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 )
- {
- (void)ubi_cacheInit( mangled_cache,
- cache_compare,
- cache_free_entry,
- MANGLED_CACHE_MAX_ENTRIES,
- MANGLED_CACHE_MAX_MEMORY );
- mc_initialized = True;
- }
- else
- {
- (void)ubi_cacheClear( mangled_cache );
- }
-
- /*
- (void)ubi_cacheSetMaxEntries( mangled_cache, lp_mangled_cache_entries() );
- (void)ubi_cacheSetMaxMemory( mangled_cache, lp_mangled_cache_memory() );
- */
- } /* reset_mangled_cache */
-
-
-/* ************************************************************************** **
- * 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 consistent
- * 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;
- size_t mangled_len;
- size_t raw_len;
- size_t i;
-
- /* If the cache isn't initialized, give up. */
- if( !mc_initialized )
- return;
-
- /* 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_m( mangled_name, '.' );
- if( s1 && (s2 = strrchr_m( raw_name, '.' )) )
- {
- i = 1;
- while( s1[i] && (tolower( s1[1] ) == s2[i]) )
- i++;
- if( !s1[i] && !s2[i] )
- {
- mangled_len -= i;
- raw_len -= i;
- }
- }
-
- /* Allocate a new cache entry. If the allocation fails, just return. */
- i = sizeof( ubi_cacheEntry ) + mangled_len + raw_len + 2;
- new_entry = malloc( i );
- if( !new_entry )
- return;
-
- /* 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
- *
- * 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 )
-{
- ubi_cacheEntryPtr FoundPtr;
- char *ext_start = NULL;
- char *found_name;
- char *saved_ext = NULL;
-
- /* If the cache isn't initialized, give up. */
- if( !mc_initialized )
- return( False );
-
- FoundPtr = ubi_cacheGet( mangled_cache, (ubi_trItemPtr)s );
-
- /* If we didn't find the name *with* the extension, try without. */
- if( !FoundPtr )
- {
- ext_start = strrchr_m( s, '.' );
- if( ext_start )
- {
- if((saved_ext = strdup(ext_start)) == NULL)
- return False;
-
- *ext_start = '\0';
- FoundPtr = ubi_cacheGet( mangled_cache, (ubi_trItemPtr)s );
- /*
- * At this point s is the name without the
- * extension. We re-add the extension if saved_ext
- * is not null, before freeing saved_ext.
- */
- }
- }
-
- /* Okay, if we haven't found it we're done. */
- if( !FoundPtr )
- {
- if(saved_ext)
- {
- /* Replace the saved_ext as it was truncated. */
- (void)pstrcat( s, saved_ext );
- SAFE_FREE(saved_ext);
- }
- return( False );
- }
-
- /* 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) );
-
- (void)pstrcpy( s, found_name );
- if( saved_ext )
- {
- /* Replace the saved_ext as it was truncated. */
- (void)pstrcat( s, saved_ext );
- SAFE_FREE(saved_ext);
- }
-
- 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. */
- {
- static pstring matching_bit; /* The bit of the string which matches */
- /* a * in pattern if indeed there is a * */
- char *sp; /* Pointer into s. */
- char *pp; /* Pointer into p. */
- 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; /* Initialize the pointers. */
- sp = s;
-
- if( strequal(s, ".") || strequal(s, ".."))
- {
- return NULL; /* Do not map '.' and '..' */
- }
-
- 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. */
- {
- sp++; /* Keep looking. */
- pp++;
- }
-
- if( !*sp && !*pp ) /* End of pattern. */
- return( matching_bit ); /* Simple match. Return empty string. */
-
- if( *pp == '*' )
- {
- pp++; /* Always interrested in the chacter */
- /* after the '*' */
- if( !*pp ) /* It is at the end of the pattern. */
- {
- StrnCpy( matching_bit, s, sp-s );
- return( matching_bit );
- }
- else
- {
- /* The next character in pattern must match a character further */
- /* 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++; /* Keep looking. */
- if( !*sp ) /* Got to the end without a match. */
- {
- return( NULL );
- } /* Still hope for a match. */
- else
- {
- /* Now sp should point to a matching character. */
- 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. */
- {
- sp++; /* Keep looking. */
- pp++;
- }
- if( !*sp && !*pp ) /* Both at end so it matched */
- return( matching_bit );
- else
- return( NULL );
- }
- }
- }
- return( NULL ); /* No match. */
- } /* map_filename */
-
-
-/* ************************************************************************** **
- * 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)
- {
- 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 )
- {
- while( (*start) && (*start != '(') )
- 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 == ')')) )
- 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, ("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) );
- end = start;
- np = new_string;
- while( (*end) /* Not the end of string. */
- && (*end != ')') /* Not the end of the pattern. */
- && (*end != '*') ) /* Not a wildcard. */
- *np++ = *end++;
- if( !*end )
- {
- start = end;
- continue; /* Always check for the end. */
- }
- if( *end == '*' )
- {
- 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. */
- *np++ = *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) );
- }
- start = end; /* Skip a bit which cannot be wanted anymore. */
- start++;
- }
- } /* do_fwd_mangled_map */
-
-/*****************************************************************************
- * do the actual mangling to 8.3 format
- * the buffer must be able to hold 13 characters (including the null)
- *****************************************************************************
- */
-void mangle_name_83( char *s)
- {
- int csum;
- char *p;
- char extension[4];
- char base[9];
- int baselen = 0;
- int extlen = 0;
-
- extension[0] = 0;
- base[0] = 0;
-
- p = strrchr_m(s,'.');
- if( p && (strlen(p+1) < (size_t)4) )
- {
- BOOL all_normal = ( strisnormal(p+1) ); /* XXXXXXXXX */
-
- if( all_normal && p[1] != 0 )
- {
- *p = 0;
- csum = str_checksum( s );
- *p = '.';
- }
- else
- csum = str_checksum(s);
- }
- else
- csum = str_checksum(s);
-
- strupper( s );
-
- DEBUG( 5, ("Mangling name %s to ",s) );
-
- if( p )
- {
- if( p == s )
- safe_strcpy( extension, "___", 3 );
- else
- {
- *p++ = 0;
- while( *p && extlen < 3 )
- {
- if( /*isdoschar (*p) &&*/ *p != '.' )
- extension[extlen++] = p[0];
- p++;
- }
- extension[extlen] = 0;
- }
- }
-
- p = s;
-
- while( *p && baselen < 5 )
- {
- if( /*isdoschar( *p ) &&*/ *p != '.' )
- base[baselen++] = p[0];
- p++;
- }
- base[baselen] = 0;
-
- csum = csum % (MANGLE_BASE*MANGLE_BASE);
-
- (void)slprintf(s, 12, "%s%c%c%c",
- base, magic_char, mangle( csum/MANGLE_BASE ), mangle( csum ) );
-
- if( *extension )
- {
- (void)pstrcat( s, "." );
- (void)pstrcat( s, extension );
- }
-
- DEBUG( 5, ( "%s\n", s ) );
-
- } /* mangle_name_83 */
-
-/*****************************************************************************
- * 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.
- * cache83 - If False, the mangled name cache will not be updated.
- * This is usually used to prevent that we overwrite
- * a conflicting cache entry prematurely, i.e. before
- * we know whether the client is really interested in the
- * current name. (See PR#13758). UKD.
- * 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, BOOL cache83, int snum)
-{
- char *map;
- DEBUG(5,("name_map_mangle( %s, need83 = %s, cache83 = %s, %d )\n", OutName,
- need83 ? "TRUE" : "FALSE", cache83 ? "TRUE" : "FALSE", snum));
-
-#ifdef MANGLE_LONG_FILENAMES
- if( !need83 && is_illegal_name(OutName) )
- need83 = True;
-#endif
-
- /* apply any name mappings */
- map = lp_mangled_map(snum);
-
- 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)) {
- char *tmp = NULL;
-
- if (!lp_manglednames(snum)) {
- return(False);
- }
-
- /* mangle it into 8.3 */
- if (cache83)
- tmp = strdup(OutName);
-
- mangle_name_83(OutName);
-
- if(tmp != NULL) {
- cache_mangled_name(OutName, tmp);
- SAFE_FREE(tmp);
- }
- }
-
- DEBUG(5,("name_map_mangle() ==> [%s]\n", OutName));
- return(True);
-} /* name_map_mangle */
-
-#endif
-
-
-
-
/* -------------------------------------------------------------------- */
-/*
- Unix SMB/Netbios implementation.
- Version 3.0
- Name mangling with persistent tdb
- Copyright (C) Simo Sorce <idra@samba.org> 2001
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#if 1
#define MANGLE_TDB_VERSION "20010927"
#define MANGLE_TDB_FILE_NAME "mangle.tdb"
@@ -1007,7 +43,7 @@ BOOL name_map_mangle(char *OutName, BOOL need83, BOOL cache83, int snum)
#define LONG_PREFIX "LONG_"
#define COUNTER_PREFIX "COUNTER_"
#define MANGLE_COUNTER_MAX 99
-#define MANGLE_SUFFIX_SIZE 2
+#define MANGLE_SUFFIX_SIZE 3 /* "~XX" */
static TDB_CONTEXT *mangle_tdb;
@@ -1063,59 +99,39 @@ static int ucs2_to_dos(char *dest, const smb_ucs2_t *src, int dest_len)
return ret;
}
-/* trasform a ucs2 string in a dos charset string that contain only valid chars for 8.3 filenames */
-static int ucs2_to_dos83(char *dest, const smb_ucs2_t *src, int dest_len)
+/* trasform in a string that contain only valid chars for win filenames */
+static void strvalid(smb_ucs2_t *src)
{
- int src_len, ret;
- smb_ucs2_t *u2s;
+ if (!src || !*src) return;
- u2s = (smb_ucs2_t *)malloc((strlen_w(src) + 1) * sizeof(smb_ucs2_t));
- if (!u2s) {
- DEBUG(0, ("ucs2_to_dos83: out of memory!\n"));
- return 0;
+ while (*src) {
+ if (!isvalid83_w(*src)) *src = UCS2_CHAR('_');
+ src++;
}
-
- src_len = strlen_w(src);
-
- u2s[src_len] = 0;
- while (src_len--)
- {
- smb_ucs2_t c;
-
- c = src[src_len];
- if (isvalid83_w(c)) u2s[src_len] = c;
- else u2s[src_len] = UCS2_CHAR('_');
- }
-
- ret = ucs2_to_dos(dest, u2s, dest_len);
-
- SAFE_FREE(u2s);
-
- return ret;
}
/* return False if something fail and
* return 2 alloced unicode strings that contain prefix and extension
*/
-static BOOL mangle_get_prefix(const smb_ucs2_t *ucs2_string, smb_ucs2_t **prefix, smb_ucs2_t **extension)
+static NTSTATUS mangle_get_prefix(const smb_ucs2_t *ucs2_string, smb_ucs2_t **prefix, smb_ucs2_t **extension)
{
- size_t str_len;
+ size_t ext_len;
smb_ucs2_t *p;
- fstring ext;
*extension = 0;
*prefix = strdup_w(ucs2_string);
if (!*prefix)
{
DEBUG(0,("mangle_get_prefix: out of memory!\n"));
- return False;
+ return NT_STATUS_NO_MEMORY;
}
- if ((p = strrchr_wa(*prefix, '.')))
+ if ((p = strrchr_w(*prefix, UCS2_CHAR('.'))))
{
p++;
- str_len = ucs2_to_dos83(ext, p, sizeof(ext));
- if (str_len > 0 && str_len < 4) /* check extension */
+ ext_len = strlen_w(p);
+ if ((ext_len > 0) && (ext_len < 4)
+ && (NT_STATUS_IS_OK(has_valid_chars(p)))) /* check extension */
{
*(p - 1) = 0;
*extension = strdup_w(p);
@@ -1123,12 +139,11 @@ static BOOL mangle_get_prefix(const smb_ucs2_t *ucs2_string, smb_ucs2_t **prefix
{
DEBUG(0,("mangle_get_prefix: out of memory!\n"));
SAFE_FREE(*prefix);
- return False;
+ return NT_STATUS_NO_MEMORY;
}
}
}
-
- return True;
+ return NT_STATUS_OK;
}
@@ -1144,12 +159,18 @@ smb_ucs2_t *unmangle(const smb_ucs2_t *mangled)
BOOL ret;
if (strlen_w(mangled) > 12) return NULL;
- if (!strchr_wa(mangled, '~')) return NULL;
-
- ret = mangle_get_prefix(mangled, &pref, &ext);
- if (!ret) return NULL;
-
- /* TODO: get out extension */
+ if (!strchr_w(mangled, UCS2_CHAR('~'))) return NULL;
+
+ /* if it is a path refuse to proceed */
+ if (strchr_w(mangled, UCS2_CHAR('/'))) {
+ DEBUG(10, ("unmangle: cannot unmangle a path\n"));
+ return NULL;
+ }
+
+ if (NT_STATUS_IS_ERR(mangle_get_prefix(mangled, &pref, &ext)))
+ return NULL;
+
+ /* mangled names are stored lowercase only */
strlower_w(pref);
/* set search key */
muf_len = ucs2_to_dos(mufname, pref, sizeof(mufname));
@@ -1205,7 +226,12 @@ done:
}
/* unmangled must contain only the file name, not a path.
- and MUST be ZERO terminated */
+ and MUST be ZERO terminated.
+ return a new allocated string if the name is yet valid 8.3
+ or is mangled successfully.
+ return null on error.
+ */
+
smb_ucs2_t *mangle(const smb_ucs2_t *unmangled)
{
TDB_DATA data, key, klock;
@@ -1217,18 +243,26 @@ smb_ucs2_t *mangle(const smb_ucs2_t *unmangled)
BOOL tclock = False;
char suffix[7];
smb_ucs2_t *mangled = NULL;
- smb_ucs2_t *um, *ext, *p = NULL;
- smb_ucs2_t temp[9];
+ smb_ucs2_t *umpref, *ext, *p = NULL;
size_t pref_len, ext_len, ud83_len;
- uint32 n, c, pos;
- /* TODO: if it is a path return a failure ?? */
- if (!mangle_get_prefix(unmangled, &um, &ext)) return NULL;
+ /* if it is a path refuse to proceed */
+ if (strchr_w(unmangled, UCS2_CHAR('/'))) {
+ DEBUG(10, ("mangle: cannot mangle a path\n"));
+ return NULL;
+ }
+
+ /* if it is a valid 8_3 do not mangle again */
+ if (NT_STATUS_IS_OK(is_8_3_w(unmangled)))
+ return strdup_w(unmangled);
+
+ if (NT_STATUS_IS_ERR(mangle_get_prefix(unmangled, &umpref, &ext)))
+ return NULL;
/* test if the same is yet mangled */
/* set search key */
- pull_ucs2(NULL, longname, um, sizeof(longname), 0, STR_TERMINATE);
+ pull_ucs2(NULL, longname, umpref, sizeof(longname), 0, STR_TERMINATE);
slprintf(keystr, sizeof(keystr)-1, "%s%s", LONG_PREFIX, longname);
key.dptr = keystr;
key.dsize = strlen(keystr) + 1;
@@ -1237,6 +271,9 @@ smb_ucs2_t *mangle(const smb_ucs2_t *unmangled)
data = tdb_fetch (mangle_tdb, key);
if (!data.dptr) /* not found */
{
+ smb_ucs2_t temp[9];
+ size_t len, n, c, pos;
+
if (tdb_error(mangle_tdb) != TDB_ERR_NOEXIST)
{
DEBUG(0, ("mangle: database retrieval error: %s\n",
@@ -1246,24 +283,28 @@ smb_ucs2_t *mangle(const smb_ucs2_t *unmangled)
/* if not find the first free possibile mangled name */
- n = 0;
+ pos = strlen_w(umpref);
+ if ((8 - MANGLE_SUFFIX_SIZE) < pos)
+ pos = 8 - MANGLE_SUFFIX_SIZE;
+ pos++;
do
{
- n++;
- pos = 8 - n - MANGLE_SUFFIX_SIZE;
+ pos--;
if (pos == 0)
{
DEBUG(0, ("mangle: unable to mangle file name!\n"));
goto done;
}
- strncpy_w(temp, um, pos);
+ strncpy_w(temp, umpref, pos);
temp[pos] = 0;
strlower_w(temp);
- ud83_len = ucs2_to_dos83(prefix, temp, sizeof(prefix));
+ /* convert any invalid char into '_' */
+ strvalid(temp);
+ ud83_len = ucs2_to_dos(prefix, temp, sizeof(prefix));
if (!ud83_len) goto done;
}
- while (ud83_len > 8 - (MANGLE_SUFFIX_SIZE + 1));
+ while (ud83_len > 8 - MANGLE_SUFFIX_SIZE);
slprintf(keylock, sizeof(keylock)-1, "%s%s", COUNTER_PREFIX, prefix);
klock.dptr = keylock;
@@ -1313,7 +354,7 @@ smb_ucs2_t *mangle(const smb_ucs2_t *unmangled)
temp[pos] = UCS2_CHAR('~');
temp[pos+1] = 0;
snprintf(suffix, 7, "%.6d", c);
- strncat_wa(temp, &suffix[6 - MANGLE_SUFFIX_SIZE], MANGLE_SUFFIX_SIZE + 1);
+ strncat_wa(temp, &suffix[7 - MANGLE_SUFFIX_SIZE], MANGLE_SUFFIX_SIZE);
ud83_len = ucs2_to_dos(mufname, temp, sizeof(mufname));
if (!ud83_len) goto done;
@@ -1327,8 +368,8 @@ smb_ucs2_t *mangle(const smb_ucs2_t *unmangled)
slprintf(keystr, sizeof(keystr)-1, "%s%s", MANGLED_PREFIX, mufname);
key.dptr = keystr;
key.dsize = strlen (keystr) + 1;
- data.dsize = (strlen_w(um) + 1) * sizeof (smb_ucs2_t);
- data.dptr = (void *)um;
+ data.dsize = (strlen_w(umpref) + 1) * sizeof (smb_ucs2_t);
+ data.dptr = (void *)umpref;
if (tdb_store(mangle_tdb, key, data, TDB_INSERT) != TDB_SUCCESS)
{
@@ -1338,7 +379,7 @@ smb_ucs2_t *mangle(const smb_ucs2_t *unmangled)
}
/* store the mangled entry with long key*/
- pull_ucs2(NULL, longname, um, sizeof(longname), 0, STR_TERMINATE);
+ pull_ucs2(NULL, longname, umpref, sizeof(longname), 0, STR_TERMINATE);
slprintf(keystr, sizeof(keystr)-1, "%s%s", LONG_PREFIX, longname);
key.dptr = keystr;
key.dsize = strlen (keystr) + 1;
@@ -1431,10 +472,14 @@ smb_ucs2_t *mangle(const smb_ucs2_t *unmangled)
}
}
+ /* mangled name are returned in upper or lower case depending on
+ case_default value */
+ strnorm_w(mangled);
+
done:
if (tclock) tdb_chainunlock(mangle_tdb, klock);
SAFE_FREE(p);
- SAFE_FREE(um);
+ SAFE_FREE(umpref);
SAFE_FREE(ext);
return mangled;
@@ -1443,7 +488,7 @@ done:
/* non unicode compatibility functions */
-char *dos_mangle(char *dos_unmangled)
+char *dos_mangle(const char *dos_unmangled)
{
smb_ucs2_t *in, *out;
char *dos_mangled;
@@ -1481,7 +526,7 @@ done:
return dos_mangled;
}
-char *dos_unmangle(char *dos_mangled)
+char *dos_unmangle(const char *dos_mangled)
{
smb_ucs2_t *in, *out;
char *dos_unmangled;
@@ -1519,18 +564,153 @@ done:
return dos_unmangled;
}
+BOOL is_8_3(const char *fname, BOOL check_case)
+{
+ smb_ucs2_t *ucs2name;
+ NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-/* backward compatibility functions */
+ if (!fname || !*fname) return False;
+
+ DEBUG(10,("is_8_3: testing [%s]\n", fname));
+
+ if (strlen(fname) > 12) return False;
+
+ ucs2name = (smb_ucs2_t *)malloc(13 * sizeof(smb_ucs2_t));
+ if (!ucs2name)
+ {
+ DEBUG(0,("is_8_3: out of memory!\n"));
+ goto done;
+ }
+
+ push_ucs2(NULL, ucs2name, fname, 13, STR_TERMINATE);
+ ret = is_8_3_w(ucs2name);
+
+done:
+ SAFE_FREE(ucs2name);
+
+ DEBUG(10,("is_8_3: returning -> %s\n", NT_STATUS_IS_OK(ret)?"True":"False"));
+
+ if (NT_STATUS_IS_ERR(ret)) return False;
+ else return True;
+}
-BOOL is_mangled(char *s)
+NTSTATUS is_8_3_w(const smb_ucs2_t *fname)
+{
+ smb_ucs2_t *pref = 0, *ext = 0, *p;
+ size_t plen;
+ NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+ if (!fname || !*fname) return NT_STATUS_INVALID_PARAMETER;
+
+ DEBUG(10,("is_8_3_w: testing\n")); /* [%s]\n", fname)); */
+
+ if (strlen_w(fname) > 12) return NT_STATUS_UNSUCCESSFUL;
+
+ if (strcmp_wa(fname, ".") == 0 || strcmp_wa(fname, "..") == 0)
+ return NT_STATUS_OK;
+
+ if (NT_STATUS_IS_ERR(is_valid_name(fname))) goto done;
+
+ if (NT_STATUS_IS_ERR(mangle_get_prefix(fname, &pref, &ext))) goto done;
+ plen = strlen_w(pref);
+ if (plen < 1 || plen > 8) goto done;
+ if (ext) if (strlen_w(ext) > 3) goto done;
+
+ ret = NT_STATUS_OK;
+
+done:
+ SAFE_FREE(pref);
+ SAFE_FREE(ext);
+ return ret;
+}
+
+NTSTATUS has_valid_chars(const smb_ucs2_t *s)
+{
+ NTSTATUS ret = NT_STATUS_OK;
+
+ if (!s || !*s) return NT_STATUS_INVALID_PARAMETER;
+
+ DEBUG(10,("has_valid_chars: testing\n")); /* [%s]\n", s)); */
+
+ /* CHECK: this should not be necessary if the ms wild chars
+ are not valid in valid.dat --- simo */
+ if (ms_has_wild_w(s)) return NT_STATUS_UNSUCCESSFUL;
+
+ while (*s) {
+ if(!isvalid83_w(*s)) return NT_STATUS_UNSUCCESSFUL;
+ s++;
+ }
+
+ return ret;
+}
+
+NTSTATUS is_valid_name(const smb_ucs2_t *fname)
+{
+ smb_ucs2_t *str, *p;
+ NTSTATUS ret = NT_STATUS_OK;
+
+ if (!fname || !*fname) return NT_STATUS_INVALID_PARAMETER;
+
+ DEBUG(10,("has_valid_chars: testing\n")); /* [%s]\n", s)); */
+
+ ret = has_valid_chars(fname);
+ if (NT_STATUS_IS_ERR(ret)) return ret;
+
+ str = strdup_w(fname);
+ p = strchr_w(str, UCS2_CHAR('.'));
+ if (p) *p = 0;
+ strupper_w(str);
+ p = &(str[1]);
+
+ switch(str[0])
+ {
+ case UCS2_CHAR('A'):
+ if(strcmp_wa(p, "UX") == 0)
+ ret = NT_STATUS_UNSUCCESSFUL;
+ break;
+ case UCS2_CHAR('C'):
+ if((strcmp_wa(p, "LOCK$") == 0)
+ || (strcmp_wa(p, "ON") == 0)
+ || (strcmp_wa(p, "OM1") == 0)
+ || (strcmp_wa(p, "OM2") == 0)
+ || (strcmp_wa(p, "OM3") == 0)
+ || (strcmp_wa(p, "OM4") == 0)
+ )
+ ret = NT_STATUS_UNSUCCESSFUL;
+ break;
+ case UCS2_CHAR('L'):
+ if((strcmp_wa(p, "PT1") == 0)
+ || (strcmp_wa(p, "PT2") == 0)
+ || (strcmp_wa(p, "PT3") == 0)
+ )
+ ret = NT_STATUS_UNSUCCESSFUL;
+ break;
+ case UCS2_CHAR('N'):
+ if(strcmp_wa(p, "UL") == 0)
+ ret = NT_STATUS_UNSUCCESSFUL;
+ break;
+ case UCS2_CHAR('P'):
+ if(strcmp_wa(p, "RN") == 0)
+ ret = NT_STATUS_UNSUCCESSFUL;
+ break;
+ default:
+ break;
+ }
+
+ SAFE_FREE(str);
+ return ret;
+}
+
+BOOL is_mangled(const char *s)
{
smb_ucs2_t *u2, *res;
size_t u2len;
BOOL ret = False;
- DEBUG(10,("is_mangled: testing -> [%s]\n", s));
+ DEBUG(10,("is_mangled: testing [%s]\n", s));
if (!s || !*s) return False;
+ if ((strlen(s) > 12) || (!strchr(s, '~'))) return False;
u2len = (strlen(s) + 1) * sizeof(smb_ucs2_t);
u2 = (smb_ucs2_t *)malloc(u2len);
@@ -1545,63 +725,48 @@ BOOL is_mangled(char *s)
if (res) ret = True;
SAFE_FREE(res);
SAFE_FREE(u2);
- DEBUG(10,("is_mangled: returning -> %s\n", ret?"True":"False"));
+ DEBUG(10,("is_mangled: returning [%s]\n", ret?"True":"False"));
return ret;
}
-BOOL is_8_3(char *fname, BOOL check_case)
+NTSTATUS is_mangled_w(const smb_ucs2_t *s)
{
- smb_ucs2_t *u2, *pref = 0, *ext = 0;
- char *s1 = 0, *s2;
- size_t u2len, plen;
- BOOL ret = False;
-
- DEBUG(10,("is_8_3: testing -> [%s]\n", fname));
+ smb_ucs2_t *res;
+ NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
- if (!fname || !*fname) return False;
-
- if (strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0) return True;
+ res = unmangle(s);
+ if (res) ret = NT_STATUS_OK;
+ SAFE_FREE(res);
+ return ret;
+}
- u2len = (strlen(fname) + 1) * sizeof(smb_ucs2_t);
- u2 = (smb_ucs2_t *)malloc(u2len);
- if (!u2)
- {
- DEBUG(0,("is_8_3: out of memory!\n"));
- goto done;
- }
- s1 = (char *) malloc(u2len * 2);
- if (!s1)
- {
- DEBUG(0,("is_8_3: out of memory!\n"));
- goto done;
+NTSTATUS path_has_mangled(const smb_ucs2_t *s)
+{
+ smb_ucs2_t *p, *f, *b;
+ NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+ if (!s || !*s) return NT_STATUS_INVALID_PARAMETER;
+
+ p = strdup_w(s);
+ if (!p) return NT_STATUS_NO_MEMORY;
+ trim_string_wa(p, "/", "/");
+ f = b = p;
+ while (b) {
+ b = strchr_w(f, UCS2_CHAR('/'));
+ if (b) *b = 0;
+ if (NT_STATUS_IS_OK(is_mangled_w(f))) {
+ ret = NT_STATUS_OK;
+ goto done;
+ }
+ f = b + 1;
}
- s2 = s1 + u2len;
- dos_to_ucs2(u2, fname, u2len);
-
- if (!mangle_get_prefix(u2, &pref, &ext)) goto done;
- plen = strlen_w(pref);
- if (plen < 1 || plen > 8) goto done;
- if (ext)
- if (strlen_w(ext) > 3) goto done;
-
- DEBUG(10,("pref len = %d, ext len = %d\n", pref?strlen_w(pref):0, ext?strlen_w(ext):0));
-
- ucs2_to_dos(s1, u2, u2len);
- ucs2_to_dos83(s2, u2, u2len);
-
- if (strncmp(s1, s2, u2len)) goto done;
- else ret = True;
-
done:
- SAFE_FREE(u2);
- SAFE_FREE(s1);
- SAFE_FREE(pref);
- SAFE_FREE(ext);
-
- DEBUG(10,("is_8_3: returning -> %s\n", ret?"True":"False"));
- return ret;
+ SAFE_FREE(p);
+ return ret;
}
+/* backward compatibility functions */
+
void reset_mangled_cache(void)
{
DEBUG(10,("reset_mangled_cache: compatibility function, remove me!\n"));
@@ -1687,7 +852,7 @@ BOOL name_map_mangle(char *OutName, BOOL need83, BOOL cache83, int snum)
return True;
}
-#endif /* 0 */
+
#if 0 /* TEST_MANGLE_CODE */