Samba-Patch samba-3.0.20b

[Thomas Neumann]

Jeremy Allison schrieb:
> On Mon, Nov 21, 2005 at 06:10:01PM -0800, Jeremy Allison wrote:
> 
>>On Mon, Nov 21, 2005 at 07:01:18PM +0100, Thomas Neumann wrote:
>>
>>>Hello,
>>>...
> 
> Ok, can you try this please. I think it's correct but will do lots
> more checking....
> 
> Thanks,
> 
> 	Jeremy.
> 
> 
> ------------------------------------------------------------------------
> 
> Index: smbd/filename.c
> ===================================================================
> --- smbd/filename.c	(revision 11837)
> +++ smbd/filename.c	(working copy)
> @@ -150,9 +150,6 @@
>  			pstrcpy(saved_last_component, name);
>  	}
>  
> -	if (!conn->case_preserve || (mangle_is_8_3(name, False, SNUM(conn)) && !conn->short_case_preserve))
> -		strnorm(name, lp_defaultcase(SNUM(conn)));
> -
>  	start = name;
>  	pstrcpy(orig_path, name);
>  
> @@ -301,16 +298,17 @@
>  					return(False);
>  				}
>  
> -				/* 
> +				/*
>  				 * Just the last part of the name doesn't exist.
> -				 * We may need to strupper() or strlower() it in case
> -				 * this conversion is being used for file creation 
> -				 * purposes. If the filename is of mixed case then 
> -				 * don't normalise it.
> +				 * We need to strupper() or strlower() it as
> +				 * this conversion may be used for file creation 
> +				 * purposes. Fix inspired by Thomas Neumann <t.neumann at iku-ag.de>.
>  				 */
> -
> -				if (!conn->case_preserve && (!strhasupper(start) || !strhaslower(start)))		
> +				if (!conn->case_preserve ||
> +						(mangle_is_8_3(start, False, SNUM(conn)) &&
> +						 !conn->short_case_preserve)) {
>  					strnorm(start, lp_defaultcase(SNUM(conn)));
> +				}
>  
>  				/*
>  				 * check on the mangled stack to see if we can recover the 

Hi Jeremy,

this works great. I just tested your patch and everything was ok.

Thanks and good luck on further programming,

	Thomas

-- 
Thomas Neumann         iKu Systemhaus AG        http://www.iku-ag.de/
Software-Entwicklung   Am Römerkastell 4        Telefon 0681/96751-50
                        66121 Saarbrücken        Telefax 0681/96751-66

GnuPG 1024D/0x946B33C7 9A44 7355 647C 5221 B432 F75A 203D 28AE 946B 33C7