Attachment 1590 Details for Bug 1216 – Patch

[patch] Patch

look (text/plain), 1.24 KB, created by Jeremy Allison on 2005-11-22 11:06:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2005-11-22 11:06:09 UTC

Size: 1.24 KB

patch

obsolete

>Index: smbd/filename.c
>===================================================================
>--- smbd/filename.c	(revision 11860)
>+++ 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@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

Actions: View

Attachments on bug 1216: 1581 | 1590