svn commit: samba r21770 - in branches: SAMBA_3_0/source/smbd
SAMBA_3_0_25/source/smbd
jra at samba.org
jra at samba.org
Fri Mar 9 02:40:50 GMT 2007
Author: jra
Date: 2007-03-09 02:40:49 +0000 (Fri, 09 Mar 2007)
New Revision: 21770
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21770
Log:
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.
Modified:
branches/SAMBA_3_0/source/smbd/reply.c
branches/SAMBA_3_0_25/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c 2007-03-09 02:16:03 UTC (rev 21769)
+++ branches/SAMBA_3_0/source/smbd/reply.c 2007-03-09 02:40:49 UTC (rev 21770)
@@ -1010,6 +1010,11 @@
}
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;
Modified: branches/SAMBA_3_0_25/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/reply.c 2007-03-09 02:16:03 UTC (rev 21769)
+++ branches/SAMBA_3_0_25/source/smbd/reply.c 2007-03-09 02:40:49 UTC (rev 21770)
@@ -1009,6 +1009,11 @@
}
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;
More information about the samba-cvs
mailing list