diff options
| author | Volker Lendecke <vl@samba.org> | 2010-01-10 17:39:27 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-01-10 20:56:16 +0100 |
| commit | 3ea64e0ad86c35e5f0018ac60571e7a31a968543 (patch) | |
| tree | 466ba7bc27e51491a9f64339e988a5468e5bd733 /source3/rpc_server | |
| parent | 50b7a3233f1edc184acb0b65870fff1db1226ef4 (diff) | |
| download | samba-3ea64e0ad86c35e5f0018ac60571e7a31a968543.tar.gz samba-3ea64e0ad86c35e5f0018ac60571e7a31a968543.tar.bz2 samba-3ea64e0ad86c35e5f0018ac60571e7a31a968543.zip | |
s3: Replace most calls to sid_append_rid() by sid_compose()
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_lsa_nt.c | 3 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index e903f0e974..857040ec8b 100644 --- a/source3/rpc_server/srv_lsa_nt.c +++ b/source3/rpc_server/srv_lsa_nt.c @@ -335,8 +335,7 @@ static NTSTATUS make_lsa_object_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *s SEC_ACE_TYPE_ACCESS_ALLOWED, map->generic_all, 0); /* Add Full Access for Domain Admins */ - sid_copy(&adm_sid, get_global_sam_sid()); - sid_append_rid(&adm_sid, DOMAIN_GROUP_RID_ADMINS); + sid_compose(&adm_sid, get_global_sam_sid(), DOMAIN_GROUP_RID_ADMINS); init_sec_ace(&ace[i++], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, map->generic_all, 0); diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 6b40385744..9f6afa1c98 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -145,8 +145,8 @@ static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd /* Add Full Access for Domain Admins if we are a DC */ if ( IS_DC ) { - sid_copy( &domadmin_sid, get_global_sam_sid() ); - sid_append_rid( &domadmin_sid, DOMAIN_GROUP_RID_ADMINS ); + sid_compose(&domadmin_sid, get_global_sam_sid(), + DOMAIN_GROUP_RID_ADMINS); init_sec_ace(&ace[i++], &domadmin_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, map->generic_all, 0); } @@ -266,8 +266,8 @@ void map_max_allowed_access(const NT_USER_TOKEN *nt_token, /* Full access for DOMAIN\Domain Admins. */ if ( IS_DC ) { DOM_SID domadmin_sid; - sid_copy( &domadmin_sid, get_global_sam_sid() ); - sid_append_rid( &domadmin_sid, DOMAIN_GROUP_RID_ADMINS ); + sid_compose(&domadmin_sid, get_global_sam_sid(), + DOMAIN_GROUP_RID_ADMINS); if (is_sid_in_token(nt_token, &domadmin_sid)) { *pacc_requested |= GENERIC_ALL_ACCESS; return; |