Author: jra
Date: 2005-08-23 17:53:11 +0000 (Tue, 23 Aug 2005)
New Revision: 9532

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9532

Log:
Fix for bug #2152, championed by Neil Hoggarth <[EMAIL PROTECTED]>.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/mangle_hash.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/mangle_hash.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/mangle_hash.c        2005-08-23 16:47:47 UTC 
(rev 9531)
+++ branches/SAMBA_3_0/source/smbd/mangle_hash.c        2005-08-23 17:53:11 UTC 
(rev 9532)
@@ -167,10 +167,6 @@
        if (strcmp_wa(fname, ".")==0 || strcmp_wa(fname, "..")==0)
                return NT_STATUS_OK;
 
-       /* Name cannot start with '.' */
-       if (*fname == UCS2_CHAR('.'))
-               return NT_STATUS_UNSUCCESSFUL;
-       
        if (only_8_3) {
                ret = has_valid_83_chars(fname, allow_wildcards);
                if (!NT_STATUS_IS_OK(ret))
@@ -247,6 +243,10 @@
        if (strcmp_wa(fname, ".") == 0 || strcmp_wa(fname, "..") == 0)
                return NT_STATUS_OK;
 
+       /* Name cannot start with '.' */
+       if (*fname == UCS2_CHAR('.'))
+               return NT_STATUS_UNSUCCESSFUL;
+       
        if (!NT_STATUS_IS_OK(is_valid_name(fname, allow_wildcards, True)))
                goto done;
 

Reply via email to