svn commit: samba r25167 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd

[jra at samba.org]

Author: jra
Date: 2007-09-14 18:24:31 +0000 (Fri, 14 Sep 2007)
New Revision: 25167

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

Log:
Fix breakage from mangling rewrite. Use the
new name if unmangling succeeded, not if it
failed. Jerry - please re-test, this should
fix your bug.
Jeremy.

Modified:
   branches/SAMBA_3_2/source/smbd/filename.c
   branches/SAMBA_3_2_0/source/smbd/filename.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/filename.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/filename.c	2007-09-14 18:06:51 UTC (rev 25166)
+++ branches/SAMBA_3_2/source/smbd/filename.c	2007-09-14 18:24:31 UTC (rev 25167)
@@ -755,7 +755,8 @@
 						name,
 						&unmangled_name,
 						conn->params);
-		if (mangled) {
+		if (!mangled) {
+			/* Name is now unmangled. */
 			name = unmangled_name;
 		}
 	}

Modified: branches/SAMBA_3_2_0/source/smbd/filename.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/filename.c	2007-09-14 18:06:51 UTC (rev 25166)
+++ branches/SAMBA_3_2_0/source/smbd/filename.c	2007-09-14 18:24:31 UTC (rev 25167)
@@ -755,7 +755,8 @@
 						name,
 						&unmangled_name,
 						conn->params);
-		if (mangled) {
+		if (!mangled) {
+			/* Name is now unmangled. */
 			name = unmangled_name;
 		}
 	}