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

[samba.git] / source3 / modules / vfs_netatalk.c

diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c
index 5715c6dd6ac24c49242427f77f1434cb9fe0b2d3..16c129de9953972d45c2fdc08adbe0bc92da7a75 100644 (file)
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -234,7 +234,7 @@ static int atalk_rmdir(struct vfs_handle_struct *handle,
        const char *path = smb_fname->base_name;
        char *dpath;
 
-       if (!handle->conn->cwd || !path) goto exit_rmdir;
+       if (!handle->conn->cwd_fname->base_name || !path) goto exit_rmdir;
 
        /* due to there is no way to change bDeleteVetoFiles variable
         * from this module, gotta use talloc stuff..
@@ -246,7 +246,7 @@ static int atalk_rmdir(struct vfs_handle_struct *handle,
                goto exit_rmdir;
 
        if (!(dpath = talloc_asprintf(ctx, "%s/%s%s", 
-         handle->conn->cwd, path, add ? "/"APPLEDOUBLE : "")))
+         handle->conn->cwd_fname->base_name, path, add ? "/"APPLEDOUBLE : "")))
                goto exit_rmdir;
 
        atalk_rrmdir(ctx, dpath);
@@ -277,7 +277,7 @@ static int atalk_rename(struct vfs_handle_struct *handle,
                return ret;
        }
 
-       if (atalk_build_paths(talloc_tos(), handle->conn->cwd, oldname,
+       if (atalk_build_paths(talloc_tos(), handle->conn->cwd_fname->base_name, oldname,
                              &adbl_path, &orig_path, &adbl_info,
                              &orig_info) != 0)
                goto exit_rename;
@@ -338,7 +338,8 @@ static int atalk_unlink(struct vfs_handle_struct *handle,
                }
        }
 
-       if (atalk_build_paths(talloc_tos(), handle->conn->cwd, path,
+       if (atalk_build_paths(talloc_tos(),
+                               handle->conn->cwd_fname->base_name, path,
                              &adbl_path, &orig_path,
                              &adbl_info, &orig_info) != 0)
                goto exit_unlink;
@@ -375,7 +376,7 @@ static int atalk_chmod(struct vfs_handle_struct *handle,
                return ret;
 
        ret1 = atalk_build_paths(ctx,
-                       handle->conn->cwd,
+                       handle->conn->cwd_fname->base_name,
                        smb_fname->base_name,
                        &adbl_path,
                        &orig_path,
@@ -414,9 +415,10 @@ static int atalk_chown(struct vfs_handle_struct *handle,
        if (!(ctx = talloc_init("chown_file")))
                return ret;
 
-       if (atalk_build_paths(ctx, handle->conn->cwd, smb_fname->base_name,
-                             &adbl_path, &orig_path,
-                             &adbl_info, &orig_info) != 0)
+       if (atalk_build_paths(ctx, handle->conn->cwd_fname->base_name,
+                               smb_fname->base_name,
+                               &adbl_path, &orig_path,
+                               &adbl_info, &orig_info) != 0)
                goto exit_chown;
 
        if (!S_ISDIR(orig_info.st_ex_mode) && !S_ISREG(orig_info.st_ex_mode)) {
@@ -450,9 +452,10 @@ static int atalk_lchown(struct vfs_handle_struct *handle,
        if (!(ctx = talloc_init("lchown_file")))
                return ret;
 
-       if (atalk_build_paths(ctx, handle->conn->cwd, smb_fname->base_name,
-                             &adbl_path, &orig_path,
-                             &adbl_info, &orig_info) != 0)
+       if (atalk_build_paths(ctx, handle->conn->cwd_fname->base_name,
+                               smb_fname->base_name,
+                               &adbl_path, &orig_path,
+                               &adbl_info, &orig_info) != 0)
                goto exit_lchown;
 
        if (!S_ISDIR(orig_info.st_ex_mode) && !S_ISREG(orig_info.st_ex_mode)) {