s3: VFS: Change SMB_VFS_GETWD to return struct smb_filename * instead of char *.

[kai/samba-autobuild/.git] / source3 / modules / vfs_preopen.c

diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c
index 8bf30b6745ee11fa2c59443071c2ad9c02046f47..18b01e6c05e0e2a6c581d696df0aa78d1674a89b 100644 (file)
--- a/source3/modules/vfs_preopen.c
+++ b/source3/modules/vfs_preopen.c
@@ -408,7 +408,8 @@ static int preopen_open(vfs_handle_struct *handle,
 
        TALLOC_FREE(state->template_fname);
        state->template_fname = talloc_asprintf(
-               state, "%s/%s", fsp->conn->cwd, smb_fname->base_name);
+               state, "%s/%s",
+               fsp->conn->cwd_fname->base_name, smb_fname->base_name);
 
        if (state->template_fname == NULL) {
                return res;
@@ -449,8 +450,8 @@ static struct vfs_fn_pointers vfs_preopen_fns = {
        .open_fn = preopen_open
 };
 
-NTSTATUS vfs_preopen_init(void);
-NTSTATUS vfs_preopen_init(void)
+NTSTATUS vfs_preopen_init(TALLOC_CTX *);
+NTSTATUS vfs_preopen_init(TALLOC_CTX *ctx)
 {
        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
                                "preopen", &vfs_preopen_fns);