r6302: OS/2 fix from Marcel Müller <mueller@maazl.de>. Don't check for mangled names

if mangled names is off.
Jeremy.

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 4fda95d6c0e6b0fc68dadfafef9660c1b4f85f6f..dd72db2fae604fff76a1f2a8c65169bbe161cf34 100644 (file)
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -1019,6 +1019,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
        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 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                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