svn commit: samba r3225 - in branches/SAMBA_3_0/source/smbd: .
jra at samba.org
jra at samba.org
Mon Oct 25 23:39:02 GMT 2004
Author: jra
Date: 2004-10-25 23:39:01 +0000 (Mon, 25 Oct 2004)
New Revision: 3225
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/smbd&rev=3225&nolog=1
Log:
Fix correct use of resume name. Cope with the resume
name not existing. Found using Samba4 RAW-SEARCH.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/trans2.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c 2004-10-25 23:27:11 UTC (rev 3224)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2004-10-25 23:39:01 UTC (rev 3225)
@@ -1662,7 +1662,7 @@
* depend on the last file name instead.
*/
- if(requires_resume_key && *resume_name && !continue_bit) {
+ if(*resume_name && !continue_bit) {
/*
* Fix for NT redirector problem triggered by resume key indexes
@@ -1714,7 +1714,7 @@
if(current_pos < 0) {
DEBUG(7,("call_trans2findnext: notfound: seeking to pos %d\n", start_pos));
SeekDir(dirptr, start_pos);
- for(current_pos = start_pos; (dname = ReadDirName(dirptr)) != NULL; SeekDir(dirptr,++current_pos)) {
+ for(current_pos = start_pos; (dname = ReadDirName(dirptr)) != NULL; ++current_pos) {
/*
* Remember, mangle_map is called by
@@ -1737,7 +1737,11 @@
}
} /* end for */
} /* end if current_pos */
- } /* end if requires_resume_key && !continue_bit */
+ /* Can't find the name. Just resume from where we were... */
+ if (dname == 0) {
+ SeekDir(dirptr, start_pos);
+ }
+ } /* end if resume_name && !continue_bit */
for (i=0;(i<(int)maxentries) && !finished && !out_of_space ;i++) {
BOOL got_exact_match = False;
More information about the samba-cvs
mailing list