From: Jeremy Allison <jra@samba.org>
Date: Fri, 27 Jan 2017 17:09:56 +0000 (-0800)
Subject: s3: vfs: dirsort doesn't handle opendir of "." correctly.
X-Git-Tag: samba-4.4.10~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb453f5b558de3a9d601005ba002c766672859c6;p=thirdparty%2Fsamba.git

s3: vfs: dirsort doesn't handle opendir of "." correctly.

Needs to store $cwd path for correct sorting.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12499

Back-port from commit e2f34116ab6328e2b872999dc7c4bcda69c03ab2.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
---

diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index d1640880e71..0e923e61706 100644
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -137,6 +137,10 @@ static DIR *dirsort_opendir(vfs_handle_struct *handle,
 		return NULL;
 	}
 
+	if (ISDOT(data->smb_fname->base_name)) {
+		data->smb_fname->base_name = vfs_GetWd(data, handle->conn);
+	}
+
 	/* Open the underlying directory and count the number of entries */
 	data->source_directory = SMB_VFS_NEXT_OPENDIR(handle, fname, mask,
 						      attr);