1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00

Fix the overwriting of errno before use in a DEBUG statement and use the return value from store_acl_blob_fsp rather than ignoring it.

Autobuild-User: Richard Sharpe <sharpe@samba.org>
Autobuild-Date: Wed May 16 03:43:41 CEST 2012 on sn-devel-104
This commit is contained in:
Richard Sharpe 2012-05-15 07:47:14 -07:00 committed by Richard Sharpe
parent b6e36089e5
commit bfe4a2baee
2 changed files with 8 additions and 5 deletions

View File

@ -592,10 +592,13 @@ static NTSTATUS fset_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp,
NDR_PRINT_DEBUG(security_descriptor,
discard_const_p(struct security_descriptor, psd));
}
/*
* Perhaps create_acl_blob should have a status return as well
*/
create_acl_blob(psd, &blob, XATTR_SD_HASH_TYPE_SHA256, hash);
store_acl_blob_fsp(handle, fsp, &blob);
status = store_acl_blob_fsp(handle, fsp, &blob);
return NT_STATUS_OK;
return status;
}
static int acl_common_remove_object(vfs_handle_struct *handle,

View File

@ -119,12 +119,12 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle,
}
unbecome_root();
if (ret) {
errno = saved_errno;
DEBUG(5, ("store_acl_blob_fsp: setting attr failed for file %s"
"with error %s\n",
fsp_str_dbg(fsp),
strerror(errno) ));
return map_nt_error_from_unix(errno);
strerror(saved_errno) ));
errno = saved_errno;
return map_nt_error_from_unix(saved_errno);
}
return NT_STATUS_OK;
}