Attachment 12802 Details for Bug 12499 – git-am fix for master.

[patch] git-am fix for master.

0001-s3-vfs-dirsort-doesn-t-handle-opendir-of-.-correctly.patch (text/plain), 1.01 KB, created by Jeremy Allison on 2017-01-05 21:20:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-01-05 21:20:43 UTC

Size: 1.01 KB

patch

obsolete

>From e50ce5bba1d1d19b62e75eb224f5f84fc0b1cfa3 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 5 Jan 2017 12:38:07 -0800
>Subject: [PATCH] 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
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/modules/vfs_dirsort.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
>index f8568353bd9..4a3e152039f 100644
>--- a/source3/modules/vfs_dirsort.c
>+++ b/source3/modules/vfs_dirsort.c
>@@ -138,6 +138,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, smb_fname, mask,
> 						      attr);
>-- 
>2.11.0.390.gc69c2f50cf-goog
>

Flags:

uri: review+

Actions: View

Attachments on bug 12499: 12802 | 12807 | 12858 | 12859