diff options
| author | Michael Adam <obnox@samba.org> | 2010-09-20 00:40:44 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2010-09-21 06:53:29 +0200 |
| commit | a67a553f40833a182b89a058d59015bcf19640f0 (patch) | |
| tree | 422e5bc8f92b40bb439d7daf0d98f319340a52bc /source3/services | |
| parent | 7ffcf90bb9b7214e30b82a0e8e371207409052eb (diff) | |
| download | samba-a67a553f40833a182b89a058d59015bcf19640f0.tar.gz | |
s3:services_db: untangle assignments from check in construct_service_sd().
Diffstat (limited to 'source3/services')
| -rw-r--r-- | source3/services/services_db.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/services/services_db.c b/source3/services/services_db.c index 0afc6c16b4c..f3c550a91fc 100644 --- a/source3/services/services_db.c +++ b/source3/services/services_db.c @@ -114,13 +114,17 @@ static struct security_descriptor* construct_service_sd( TALLOC_CTX *ctx ) /* create the security descriptor */ - if ( !(theacl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) ) + theacl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace); + if (theacl == NULL) { return NULL; + } - if ( !(sd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1, - SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, - theacl, &sd_size)) ) + sd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1, + SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, + theacl, &sd_size); + if (sd == NULL) { return NULL; + } return sd; } |