svn commit: samba r6301 - in trunk/source/smbd: .

jra at samba.org jra at samba.org
Tue Apr 12 00:00:24 GMT 2005


Author: jra
Date: 2005-04-12 00:00:19 +0000 (Tue, 12 Apr 2005)
New Revision: 6301

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

Log:
OS/2 fix from Marcel M?\195?\188ller <mueller at maazl.de>. Don't check for mangled names
if mangled names is off.
Jeremy.

Modified:
   trunk/source/smbd/trans2.c


Changeset:
Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2005-04-11 21:54:42 UTC (rev 6300)
+++ trunk/source/smbd/trans2.c	2005-04-12 00:00:19 UTC (rev 6301)
@@ -1019,6 +1019,7 @@
 	BOOL was_8_3;
 	int nt_extmode; /* Used for NT connections instead of mode */
 	BOOL needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
+	BOOL check_mangled_names = lp_manglednames(SNUM(conn));
 
 	*fname = 0;
 	*out_of_space = False;
@@ -1063,7 +1064,7 @@
 		if(!(got_match = *got_exact_match = exact_match(fname, mask, conn->case_sensitive)))
 			got_match = mask_match(fname, mask, conn->case_sensitive);
 
-		if(!got_match && !mangle_is_8_3(fname, False)) {
+		if(!got_match && check_mangled_names && !mangle_is_8_3(fname, False)) {
 
 			/*
 			 * It turns out that NT matches wildcards against



More information about the samba-cvs mailing list