diff options
| author | Volker Lendecke <vl@samba.org> | 2011-01-15 16:20:37 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-01-15 16:34:35 +0100 |
| commit | 50b3458261fbcb304219b753a8690ed8ed9fc2cc (patch) | |
| tree | dc45900795cb568ed8e225aa8bf494f764f26cea /source3/utils | |
| parent | 4fc5699a79c4b7ff85c855755002583e8e963193 (diff) | |
| download | samba-50b3458261fbcb304219b753a8690ed8ed9fc2cc.tar.gz samba-50b3458261fbcb304219b753a8690ed8ed9fc2cc.tar.bz2 samba-50b3458261fbcb304219b753a8690ed8ed9fc2cc.zip | |
s3: Convert cli_set_secdesc to cli_trans
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc_printer.c | 10 | ||||
| -rw-r--r-- | source3/utils/smbcacls.c | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 8408235483..470d61a751 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -231,12 +231,14 @@ NTSTATUS net_copy_fileattr(struct net_context *c, } if (copy_acls) { + NTSTATUS status; /* set acls */ - if (!cli_set_secdesc(cli_share_dst, fnum_dst, sd)) { - DEBUG(0,("could not set secdesc on %s: %s\n", - dst_name, cli_errstr(cli_share_dst))); - nt_status = cli_nt_error(cli_share_dst); + status = cli_set_secdesc(cli_share_dst, fnum_dst, sd); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("could not set secdesc on %s: %s\n", + dst_name, nt_errstr(status))); + nt_status = status; goto out; } } diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 270af2135d..6a8169d39c 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -727,6 +727,7 @@ static bool set_secdesc(struct cli_state *cli, const char *filename, { uint16_t fnum = (uint16_t)-1; bool result=true; + NTSTATUS status; /* The desired access below is the only one I could find that works with NT4, W2KP and Samba */ @@ -739,9 +740,10 @@ static bool set_secdesc(struct cli_state *cli, const char *filename, return false; } - if (!cli_set_secdesc(cli, fnum, sd)) { + status = cli_set_secdesc(cli, fnum, sd); + if (!NT_STATUS_IS_OK(status)) { printf("ERROR: security description set failed: %s\n", - cli_errstr(cli)); + nt_errstr(status)); result=false; } |