diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-03 09:58:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:36:01 -0500 |
| commit | 536ca21c55643a06e53053c2576697bf6abef2b0 (patch) | |
| tree | 47ceb3c8cddfbdee09b25ef8f96395dd9ab4ac8f /source4/torture | |
| parent | d1e3dccab64712cc219bb5c6892cb0d243d109fc (diff) | |
| download | samba-536ca21c55643a06e53053c2576697bf6abef2b0.tar.gz samba-536ca21c55643a06e53053c2576697bf6abef2b0.tar.bz2 samba-536ca21c55643a06e53053c2576697bf6abef2b0.zip | |
r20504: we handle the attribute values always as DATA_BLOB's and
don't need the union with the attribute id as switch anymore
metze
(This used to be commit d47c81923d0731edd314215c6f0b2eb3d1ee252d)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/libnet/libnet_BecomeDC.c | 8 | ||||
| -rw-r--r-- | source4/torture/rpc/dssync.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c index ecee329ea3..ece76d4678 100644 --- a/source4/torture/libnet/libnet_BecomeDC.c +++ b/source4/torture/libnet/libnet_BecomeDC.c @@ -157,12 +157,12 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s, switch (a->attid) { case DRSUAPI_ATTRIBUTE_objectClass: - for (j=0; j < a->value_ctr.data_blob.num_values; j++) { + for (j=0; j < a->value_ctr.num_values; j++) { uint32_t val = 0xFFFFFFFF; - if (a->value_ctr.data_blob.values[i].data - && a->value_ctr.data_blob.values[i].data->length == 4) { - val = IVAL(a->value_ctr.data_blob.values[i].data->data,0); + if (a->value_ctr.values[i].blob + && a->value_ctr.values[i].blob->length == 4) { + val = IVAL(a->value_ctr.values[i].blob->data,0); } if (val == DRSUAPI_OBJECTCLASS_attributeSchema) { diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index 63d642b64a..972c2f1ecf 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -354,11 +354,11 @@ static void test_analyse_objects(struct DsSyncTest *ctx, continue; } - if (attr->value_ctr.data_blob.num_values != 1) continue; + if (attr->value_ctr.num_values != 1) continue; - if (!attr->value_ctr.data_blob.values[0].data) continue; + if (!attr->value_ctr.values[0].blob) continue; - data = attr->value_ctr.data_blob.values[0].data; + data = attr->value_ctr.values[0].blob; if (!dn_printed) { DEBUG(0,("DN: %s\n", dn)); |