[SCM] Samba Shared Repository - branch master updated
Richard Sharpe
sharpe at samba.org
Tue May 15 19:44:01 MDT 2012
The branch, master has been updated
via bfe4a2b 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.
from b6e3608 build: Add explicit mention of --abi-check-disable to ABI checker
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bfe4a2baeec6bc4558a617ec67532ea11f865861
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Tue May 15 07:47:14 2012 -0700
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 at samba.org>
Autobuild-Date: Wed May 16 03:43:41 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_acl_common.c | 7 +++++--
source3/modules/vfs_acl_xattr.c | 6 +++---
2 files changed, 8 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 241bc8f..221b43f 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -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,
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 5653657..c1b0a60 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -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;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list