diff options
| author | Jeremy Allison <jra@samba.org> | 2019-08-26 10:07:32 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-09-03 16:15:36 +0000 |
| commit | 754cec7756b2ddb1cfcc3984265f01cb366beb76 (patch) | |
| tree | 50b47dfb15ed4893361e7ea347ac012bd5227c5b /source3/libsmb | |
| parent | 3d82b7d11cd7b78adc6b3642e64e3a8f251de869 (diff) | |
| download | samba-754cec7756b2ddb1cfcc3984265f01cb366beb76.tar.gz | |
s3: libsmbclient: Ensure SMBC_getdents_ctx() also updates the readdirplus pointers.
If we are returning file entries, we
have a duplicate list in dirplus.
Update dirplus_next also so readdir and
readdirplus are kept in sync.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14094
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/libsmb_dir.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index 2f2117e8131..4447806c108 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -1358,6 +1358,17 @@ SMBC_getdents_ctx(SMBCCTX *context, } dir->dir_next = dirlist = dirlist -> next; + + /* + * If we are returning file entries, we + * have a duplicate list in dirplus. + * + * Update dirplus_next also so readdir and + * readdirplus are kept in sync. + */ + if (dir->dirplus_list != NULL) { + dir->dirplus_next = dir->dirplus_next->next; + } } TALLOC_FREE(frame); |