Attachment 15117 Details for Bug 13918 – git-am fix for 4.10.next, 4.9.next.

[patch] git-am fix for 4.10.next, 4.9.next.

0001-s3-modules-ceph-use-current-working-directory-instea.patch (text/plain), 1.60 KB, created by Jeremy Allison on 2019-05-02 20:25:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2019-05-02 20:25:25 UTC

Size: 1.60 KB

patch

obsolete

>From 0c2f2a6b4234afd6e4f4466bf710bd7dfb6ecc08 Mon Sep 17 00:00:00 2001
>From: Robert Sander <r.sander@heinlein-support.de>
>Date: Thu, 2 May 2019 11:20:44 -0700
>Subject: [PATCH] s3: modules: ceph: use current working directory instead of
> share path
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13918
>
>Signed-off-by: Robert Sander <r.sander@heinlein-support.de>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Ralph BÃ¶hme <slow@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Thu May  2 19:34:11 UTC 2019 on sn-devel-184
>
>(cherry picked from commit 966fc0dc604299a87e40e7170d80911475317db5)
>---
> source3/modules/vfs_ceph.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
>index 190bda8228f..53bc01b5f7f 100644
>--- a/source3/modules/vfs_ceph.c
>+++ b/source3/modules/vfs_ceph.c
>@@ -1221,14 +1221,14 @@ static struct smb_filename *cephwrap_realpath(struct vfs_handle_struct *handle,
> 	} else if ((len >= 2) && (path[0] == '.') && (path[1] == '/')) {
> 		if (len == 2) {
> 			r = asprintf(&result, "%s",
>-					handle->conn->connectpath);
>+					handle->conn->cwd_fname->base_name);
> 		} else {
> 			r = asprintf(&result, "%s/%s",
>-					handle->conn->connectpath, &path[2]);
>+					handle->conn->cwd_fname->base_name, &path[2]);
> 		}
> 	} else {
> 		r = asprintf(&result, "%s/%s",
>-				handle->conn->connectpath, path);
>+				handle->conn->cwd_fname->base_name, path);
> 	}
> 
> 	if (r < 0) {
>-- 
>2.21.0.1020.gf2820cf01a-goog
>

Flags:

jra: review? (slow)
ddiss: review+

Actions: View

Attachments on bug 13918: 15101 | 15117