[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  966fc0dc604 s3: modules: ceph: use current working directory instead of share path
      from  b20fd15e04c smbd: implement SMB_FILE_NORMALIZED_NAME_INFORMATION handling

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 966fc0dc604299a87e40e7170d80911475317db5
Author: Robert Sander <r.sander at heinlein-support.de>
Date:   Thu May 2 11:20:44 2019 -0700

    s3: modules: ceph: use current working directory instead of share path
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13918
    
    Signed-off-by: Robert Sander <r.sander at heinlein-support.de>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Böhme <slow at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu May  2 19:34:11 UTC 2019 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_ceph.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index cf45fb4c919..57de8bc891a 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -1206,14 +1206,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) {


-- 
Samba Shared Repository