diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-12-30 10:51:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:30:33 -0500 |
| commit | 2206a7d592800a9f299ab3a5ce2e7b55919f46bc (patch) | |
| tree | 6c796e213e18d0a8ef4ca2abee5d807a282eaaf2 /source4/libnet | |
| parent | bb75710d40e11f127270e2d39c957db64da63a60 (diff) | |
| download | samba-2206a7d592800a9f299ab3a5ce2e7b55919f46bc.tar.gz samba-2206a7d592800a9f299ab3a5ce2e7b55919f46bc.tar.bz2 samba-2206a7d592800a9f299ab3a5ce2e7b55919f46bc.zip | |
r20418: start to get step by step rid of the union for the attribute
specific attribute values.
start with ntSecurityDescriptor
metze
(This used to be commit c72f5a16b4de2b8cc4f4a9c21b0dc3915a1d6c9f)
Diffstat (limited to 'source4/libnet')
| -rw-r--r-- | source4/libnet/libnet_become_dc.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index bc50317594..eb929d57e4 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -29,6 +29,7 @@ #include "dsdb/common/flags.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" #include "libcli/security/security.h" +#include "librpc/gen_ndr/ndr_security.h" struct libnet_BecomeDC_state { struct composite_context *creq; @@ -1050,21 +1051,25 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s) /* ntSecurityDescriptor */ { - struct drsuapi_DsAttributeValueSecurityDescriptor *vs; + struct drsuapi_DsAttributeValueDataBlob *vs; + DATA_BLOB *vd; struct security_descriptor *v; struct dom_sid *domain_admins_sid; const char *domain_admins_sid_str; - vs = talloc_array(attrs, struct drsuapi_DsAttributeValueSecurityDescriptor, 1); + vs = talloc_array(attrs, struct drsuapi_DsAttributeValueDataBlob, 1); if (composite_nomem(vs, c)) return; + vd = talloc_array(vs, DATA_BLOB, 1); + if (composite_nomem(vd, 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, + v = security_descriptor_create(vd, /* owner: domain admins */ domain_admins_sid_str, /* owner group: domain admins */ @@ -1108,11 +1113,14 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s) NULL); if (composite_nomem(v, c)) return; - vs[0].sd = v; + c->status = ndr_push_struct_blob(&vd[0], r, v,(ndr_push_flags_fn_t)ndr_push_security_descriptor); + if (!composite_is_ok(c)) return; + + vs[0].data = &vd[0]; - attrs[i].attid = DRSUAPI_ATTRIBUTE_ntSecurityDescriptor; - attrs[i].value_ctr.security_descriptor.num_values = 1; - attrs[i].value_ctr.security_descriptor.values = vs; + attrs[i].attid = DRSUAPI_ATTRIBUTE_ntSecurityDescriptor; + attrs[i].value_ctr.data_blob.num_values = 1; + attrs[i].value_ctr.data_blob.values = vs; i++; } |