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 a9c94b81630e2e912d6f13567474e12dd7fc374b..225e0e7407dd5b3934b8227fd565df52c493778c 100644 (file)
--- 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;