diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-12-07 15:29:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:28:58 -0500 |
| commit | 81a3bd7bc840e71072695ca3b77d59de2543846f (patch) | |
| tree | 574dc905ae29b50e1444d7a7acd623b446f46577 /source4 | |
| parent | 766dfed7350dabe35e53ad182e23f89ba5d8c7e5 (diff) | |
| download | samba-81a3bd7bc840e71072695ca3b77d59de2543846f.tar.gz samba-81a3bd7bc840e71072695ca3b77d59de2543846f.tar.bz2 samba-81a3bd7bc840e71072695ca3b77d59de2543846f.zip | |
r20066: use the same sid "Domain Admins" for the security_descriptor
metze
(This used to be commit 58ae1bedf189d34f65ee07b7dd70a50a86901f05)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libnet/libnet_become_dc.c | 30 | ||||
| -rw-r--r-- | source4/libnet/libnet_become_dc.h | 1 |
2 files changed, 21 insertions, 10 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index fad131080f..7f2d64b3d3 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -62,6 +62,7 @@ struct libnet_BecomeDC_state { /* input */ const char *dns_name; const char *netbios_name; + const struct dom_sid *sid; /* constructed */ struct GUID guid; @@ -1050,17 +1051,24 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s) { struct drsuapi_DsAttributeValueSecurityDescriptor *vs; struct security_descriptor *v; - const char *sid = SID_BUILTIN_ADMINISTRATORS; + struct dom_sid *domain_admins_sid; + const char *domain_admins_sid_str; vs = talloc_array(attrs, struct drsuapi_DsAttributeValueSecurityDescriptor, 1); if (composite_nomem(vs, c)) return; + domain_admins_sid = dom_sid_add_rid(vs, s->domain.sid, DOMAIN_RID_ADMINS); + if (composite_nomem(domain_admins_sid, c)) return; + + domain_admins_sid_str = dom_sid_string(domain_admins_sid, domain_admins_sid); + if (composite_nomem(domain_admins_sid_str, c)) return; + v = security_descriptor_create(vs, - /* owner */ - sid, - /* owner group */ - sid, - /* */ + /* owner: domain admins */ + domain_admins_sid_str, + /* owner group: domain admins */ + domain_admins_sid_str, + /* authenticated users */ SID_NT_AUTHENTICATED_USERS, SEC_ACE_TYPE_ACCESS_ALLOWED, SEC_STD_READ_CONTROL | @@ -1068,8 +1076,8 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s) SEC_ADS_READ_PROP | SEC_ADS_LIST_OBJECT, 0, - /* */ - sid, + /* domain admins */ + domain_admins_sid_str, SEC_ACE_TYPE_ACCESS_ALLOWED, SEC_STD_REQUIRED | SEC_ADS_CREATE_CHILD | @@ -1081,7 +1089,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s) SEC_ADS_LIST_OBJECT | SEC_ADS_CONTROL_ACCESS, 0, - /* */ + /* system */ SID_NT_SYSTEM, SEC_ACE_TYPE_ACCESS_ALLOWED, SEC_STD_REQUIRED | @@ -1095,7 +1103,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s) SEC_ADS_LIST_OBJECT | SEC_ADS_CONTROL_ACCESS, 0, - /* */ + /* end */ NULL); if (composite_nomem(v, c)) return; @@ -1529,6 +1537,8 @@ struct composite_context *libnet_BecomeDC_send(struct libnet_context *ctx, TALLO if (composite_nomem(s->domain.dns_name, c)) return c; s->domain.netbios_name = talloc_strdup(s, r->in.domain_netbios_name); if (composite_nomem(s->domain.netbios_name, c)) return c; + s->domain.sid = dom_sid_dup(s, r->in.domain_sid); + if (composite_nomem(s->domain.sid, c)) return c; /* Source DSA input */ s->source_dsa.address = talloc_strdup(s, r->in.source_dsa_address); diff --git a/source4/libnet/libnet_become_dc.h b/source4/libnet/libnet_become_dc.h index 078281d72d..4093026875 100644 --- a/source4/libnet/libnet_become_dc.h +++ b/source4/libnet/libnet_become_dc.h @@ -22,6 +22,7 @@ struct libnet_BecomeDC { struct { const char *domain_dns_name; const char *domain_netbios_name; + const struct dom_sid *domain_sid; const char *source_dsa_address; const char *dest_dsa_netbios_name; } in; |