Attachment 12859 Details for Bug 12499 – git-am fix for 4.4.next.

[patch] git-am fix for 4.4.next.

12499-4.4 (text/plain), 1.11 KB, created by Jeremy Allison on 2017-01-27 17:16:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-01-27 17:16:41 UTC

Size: 1.11 KB

patch

obsolete

>From 006a21b093935ec8164e480e7094382c46b9f34f Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 27 Jan 2017 09:09:56 -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
>
>Back-port from commit e2f34116ab6328e2b872999dc7c4bcda69c03ab2.
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Uri Simchoni <uri@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 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);
>-- 
>2.11.0.483.g087da7b7c-goog
>

Flags:

uri: review+

Actions: View

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