summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-07-16 18:37:19 +0200
committerGünther Deschner <gd@samba.org>2009-07-17 00:13:29 +0200
commit4faef0da762fc1689ae9a3bc657fc6b5e77beb94 (patch)
tree4d44bf84b2168362ffce180a357029a56439fb39
parent35e45fb841e0c36ec2f8b2a8d7216700cc9af691 (diff)
downloadsamba-4faef0da762fc1689ae9a3bc657fc6b5e77beb94.tar.gz
samba-4faef0da762fc1689ae9a3bc657fc6b5e77beb94.tar.bz2
samba-4faef0da762fc1689ae9a3bc657fc6b5e77beb94.zip
s3-lsa: Fix pointless check for sec_info flags in _lsa_QuerySecurity().
Guenther
-rw-r--r--source3/rpc_server/srv_lsa_nt.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 1243787503..1a6d3bae16 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -1992,19 +1992,9 @@ NTSTATUS _lsa_QuerySecurity(pipes_struct *p,
return status;
}
- switch (r->in.sec_info) {
- case 1:
- /* SD contains only the owner */
- if((*r->out.sdbuf = make_sec_desc_buf(p->mem_ctx, sd_size, psd)) == NULL)
- return NT_STATUS_NO_MEMORY;
- break;
- case 4:
- /* SD contains only the ACL */
- if((*r->out.sdbuf = make_sec_desc_buf(p->mem_ctx, sd_size, psd)) == NULL)
- return NT_STATUS_NO_MEMORY;
- break;
- default:
- return NT_STATUS_INVALID_LEVEL;
+ *r->out.sdbuf = make_sec_desc_buf(p->mem_ctx, sd_size, psd);
+ if (!*r->out.sdbuf) {
+ return NT_STATUS_NO_MEMORY;
}
return status;