s3: libsmbclient: Ensure SMBC_readdir_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>
(cherry picked from commit 4bca8e097f5a909c628daa4dbfa932ddc1725ebc)

diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 886aa6265094e039db0d371b7a36dbce57b2eb81..a3ec9a8ff717fe489a4f8e3c78d1e1b481f6b575 100644 (file)
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -1174,6 +1174,17 @@ SMBC_readdir_ctx(SMBCCTX *context,
 
         dir->dir_next = dir->dir_next->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);
         return dirp;
 }