From e0866753ce23d7edb9ca14f825a01f201127f7bb Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 12 Apr 2013 11:43:24 +0200 Subject: smbd: Convert vfs_GetWd to synthetic_smb_fname Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/smbd/vfs.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index b81e8ded3f..761470c454 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -843,16 +843,14 @@ char *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn) struct file_id key; struct smb_filename *smb_fname_dot = NULL; struct smb_filename *smb_fname_full = NULL; - NTSTATUS status; if (!lp_getwd_cache()) { goto nocache; } - status = create_synthetic_smb_fname(ctx, ".", NULL, NULL, - &smb_fname_dot); - if (!NT_STATUS_IS_OK(status)) { - errno = map_errno_from_nt_status(status); + smb_fname_dot = synthetic_smb_fname(ctx, ".", NULL, NULL); + if (smb_fname_dot == NULL) { + errno = ENOMEM; goto out; } @@ -877,10 +875,10 @@ char *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn) SMB_ASSERT((cache_value.length > 0) && (cache_value.data[cache_value.length-1] == '\0')); - status = create_synthetic_smb_fname(ctx, (char *)cache_value.data, - NULL, NULL, &smb_fname_full); - if (!NT_STATUS_IS_OK(status)) { - errno = map_errno_from_nt_status(status); + smb_fname_full = synthetic_smb_fname(ctx, (char *)cache_value.data, + NULL, NULL); + if (smb_fname_full == NULL) { + errno = ENOMEM; goto out; } -- cgit