summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-07-03 11:46:50 +0200
committerVolker Lendecke <vl@samba.org>2011-07-03 22:45:25 +0200
commitcfbd339b4a9e11f781755581efbe51d99dc997b6 (patch)
tree5973378a8817f9d6892ad4ac5c62f92614a02553
parente5ad52490276dfec03a7a439c33384a442565a0d (diff)
downloadsamba-cfbd339b4a9e11f781755581efbe51d99dc997b6.tar.gz
samba-cfbd339b4a9e11f781755581efbe51d99dc997b6.tar.bz2
samba-cfbd339b4a9e11f781755581efbe51d99dc997b6.zip
s3: Remove a use of cli_errstr
-rw-r--r--source3/libsmb/libsmb_xattr.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index eeff9a9030..d04eb1122b 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -884,6 +884,7 @@ cacl_get(SMBCCTX *context,
if (ipc_cli && (all || some_nt || all_nt_acls)) {
char *targetpath = NULL;
struct cli_state *targetcli = NULL;
+ NTSTATUS status;
/* Point to the portion after "system.nt_sec_desc." */
name += 19; /* if (all) this will be invalid but unused */
@@ -898,10 +899,13 @@ cacl_get(SMBCCTX *context,
}
/* ... then obtain any NT attributes which were requested */
- if (!NT_STATUS_IS_OK(cli_ntcreate(targetcli, targetpath, 0, CREATE_ACCESS_READ, 0,
- FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
+ status = cli_ntcreate(targetcli, targetpath, 0,
+ CREATE_ACCESS_READ, 0,
+ FILE_SHARE_READ|FILE_SHARE_WRITE,
+ FILE_OPEN, 0x0, 0x0, &fnum);
+ if (!NT_STATUS_IS_OK(status)) {
DEBUG(5, ("cacl_get failed to open %s: %s\n",
- targetpath, cli_errstr(targetcli)));
+ targetpath, nt_errstr(status)));
errno = 0;
return -1;
}