summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-07-23 09:43:32 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-23 09:55:54 +0200
commitbaee2fbcfd784cababf012b22a7d4be268b4af7b (patch)
tree138c8eab1704440c3f7a016f4df64e750c5ccf32
parent7302277e43e9353cfc1a17048ebb43b0c109127a (diff)
downloadsamba-baee2fbcfd784cababf012b22a7d4be268b4af7b.tar.gz
samba-baee2fbcfd784cababf012b22a7d4be268b4af7b.tar.bz2
samba-baee2fbcfd784cababf012b22a7d4be268b4af7b.zip
s3:libsmb_xattr: make use of the new cli_query_secdesc()
metze
-rw-r--r--source3/libsmb/libsmb_xattr.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index f4c22e3422..5ed38415bf 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -911,14 +911,14 @@ cacl_get(SMBCCTX *context,
return -1;
}
- sd = cli_query_secdesc_old(targetcli, fnum, ctx);
-
- if (!sd) {
- DEBUG(5,
- ("cacl_get Failed to query old descriptor\n"));
- errno = 0;
- return -1;
- }
+ status = cli_query_secdesc(targetcli, fnum, ctx, &sd);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(5,("cacl_get Failed to query old descriptor "
+ "of %s: %s\n",
+ targetpath, nt_errstr(status)));
+ errno = 0;
+ return -1;
+ }
cli_close(targetcli, fnum);
@@ -1570,11 +1570,11 @@ cacl_set(SMBCCTX *context,
return -1;
}
- old = cli_query_secdesc_old(targetcli, fnum, ctx);
-
- if (!old) {
- DEBUG(5, ("cacl_set Failed to query old descriptor\n"));
- errno = 0;
+ status = cli_query_secdesc(targetcli, fnum, ctx, &old);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(5,("cacl_set Failed to query old descriptor of %s: %s\n",
+ targetpath, nt_errstr(status)));
+ errno = 0;
return -1;
}