summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-05-26 19:39:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:59 -0500
commit45d03e327ae8b2b9b9761ed76161d4467b27f730 (patch)
tree18d113c265897365cb6b10d9ec678996b74a0a30 /source3
parentf9ede7984cea492111ba23e3ce4f359542ff13c1 (diff)
downloadsamba-45d03e327ae8b2b9b9761ed76161d4467b27f730.tar.gz
samba-45d03e327ae8b2b9b9761ed76161d4467b27f730.tar.bz2
samba-45d03e327ae8b2b9b9761ed76161d4467b27f730.zip
r6994: Fix for bugid #2729 - it turns out resume keys are *mandatory* for
a search when listing a W2K and above server from a FATxx filesystem only. Thanks to Steve Langasek <vorlon@debian.org> for giving me the essential info that allowed me to reproduce and thus fix this. Jeremy. (This used to be commit 8227675d3dbcd4f8bb2a24ea7e3e05c428b7c929)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/clilist.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index 79c2ef66a1..892a457255 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -32,7 +32,7 @@ extern file_info def_finfo;
****************************************************************************/
static size_t interpret_long_filename(struct cli_state *cli,
- int level,char *p,file_info *finfo)
+ int level,char *p,file_info *finfo, uint32 *p_resume_key)
{
file_info finfo2;
int len;
@@ -40,6 +40,7 @@ static size_t interpret_long_filename(struct cli_state *cli,
if (!finfo) finfo = &finfo2;
+ *p_resume_key = 0;
memcpy(finfo,&def_finfo,sizeof(*finfo));
switch (level) {
@@ -85,6 +86,8 @@ static size_t interpret_long_filename(struct cli_state *cli,
{
size_t namelen, slen;
p += 4; /* next entry offset */
+
+ *p_resume_key = IVAL(p,0);
p += 4; /* fileindex */
/* these dates appear to arrive in a
@@ -146,7 +149,7 @@ static size_t interpret_long_filename(struct cli_state *cli,
int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
void (*fn)(const char *, file_info *, const char *, void *), void *state)
{
-#if 0
+#if 1
int max_matches = 1366; /* Match W2k - was 512. */
#else
int max_matches = 512;
@@ -170,6 +173,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
uint16 setup;
pstring param;
const char *mnt;
+ uint32 resume_key = 0;
/* NT uses 260, OS/2 uses 2. Both accept 1. */
info_level = (cli->capabilities&CAP_NT_SMBS)?260:1;
@@ -204,7 +208,9 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
SSVAL(param,0,ff_dir_handle);
SSVAL(param,2,max_matches); /* max count */
SSVAL(param,4,info_level);
- SIVAL(param,6,0); /* ff_resume_key */
+ /* For W2K servers serving out FAT filesystems we *must* set the
+ resume key. If it's not FAT then it's returned as zero. */
+ SIVAL(param,6,resume_key); /* ff_resume_key */
/* NB. *DON'T* use continue here. If you do it seems that W2K and bretheren
can miss filenames. Use last filename continue instead. JRA */
SSVAL(param,10,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END)); /* resume required + close on end */
@@ -277,7 +283,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
/* Last entry - fixup the last offset length. */
SIVAL(p2,0,PTR_DIFF((rdata + data_len),p2));
}
- p2 += interpret_long_filename(cli,info_level,p2,&finfo);
+ p2 += interpret_long_filename(cli,info_level,p2,&finfo,&resume_key);
}
if (ff_lastname > 0) {
@@ -317,7 +323,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
mnt = cli_cm_get_mntpoint( cli );
for (p=dirlist,i=0;i<total_received;i++) {
- p += interpret_long_filename(cli,info_level,p,&finfo);
+ p += interpret_long_filename(cli,info_level,p,&finfo,&resume_key);
fn( mnt,&finfo, Mask, state );
}