From: Jeremy Allison <jra@samba.org>
Date: Fri, 9 Mar 2007 02:40:49 +0000 (+0000)
Subject: r21770: For old DOS style searches we must remember if
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~969
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c74bcf7677123f273d44181ca053ba49b8c7ddae;p=thirdparty%2Fsamba.git

r21770: For old DOS style searches we must remember if
the initial search had a wildcard in order to
correctly return no error on end of search.
Found by Samba4 torture tester.
Jeremy.
---

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index a9c94b81630..225e0e7407d 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -1010,6 +1010,11 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
 		}
 		string_set(&conn->dirpath,dptr_path(dptr_num));
 		pstrcpy(mask, dptr_wcard(dptr_num));
+		/*
+		 * For a 'continue' search we have no string. So
+		 * check from the initial saved string.
+		 */
+		mask_contains_wcard = ms_has_wild(mask);
 	}
 
 	p = smb_buf(outbuf) + 3;