diff options
author | Jeremy Allison <jra@samba.org> | 2007-03-09 02:40:49 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:31 -0500 |
commit | dd011f453eed247a92973206239129bc21c26534 (patch) | |
tree | 6dbb031a975c2e383db14dea56e757639559cf6d | |
parent | 12c617af08bdded3a3a60196016e9cb207eedccf (diff) | |
download | samba-dd011f453eed247a92973206239129bc21c26534.tar.gz samba-dd011f453eed247a92973206239129bc21c26534.tar.bz2 samba-dd011f453eed247a92973206239129bc21c26534.zip |
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.
(This used to be commit c74bcf7677123f273d44181ca053ba49b8c7ddae)
-rw-r--r-- | source3/smbd/reply.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index a9c94b8163..225e0e7407 100644 --- a/source3/smbd/reply.c +++ b/source3/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; |