diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-12-10 11:25:44 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-12-10 17:51:27 +1100 |
| commit | 81bc561330abfec837bd65ad57c4a5266c237990 (patch) | |
| tree | ddf90bf6a747b63f0ccee8cc41aca04afca08387 /source4/dsdb/schema/schema_init.c | |
| parent | f01ea8bf589a876bab14907d1ec6a998c23f87c9 (diff) | |
| download | samba-81bc561330abfec837bd65ad57c4a5266c237990.tar.gz samba-81bc561330abfec837bd65ad57c4a5266c237990.tar.bz2 samba-81bc561330abfec837bd65ad57c4a5266c237990.zip | |
s4-dsdb: simplify schema code using new GUID functions
Diffstat (limited to 'source4/dsdb/schema/schema_init.c')
| -rw-r--r-- | source4/dsdb/schema/schema_init.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c index 069da95611..4af36838cd 100644 --- a/source4/dsdb/schema/schema_init.c +++ b/source4/dsdb/schema/schema_init.c @@ -975,12 +975,8 @@ static struct drsuapi_DsReplicaAttribute *dsdb_find_object_attr_name(struct dsdb if (_a && _a->value_ctr.num_values >= 1 \ && _a->value_ctr.values[0].blob \ && _a->value_ctr.values[0].blob->length == 16) { \ - enum ndr_err_code _ndr_err; \ - _ndr_err = ndr_pull_struct_blob_all(_a->value_ctr.values[0].blob, \ - mem_ctx, s->iconv_convenience, &(p)->elem, \ - (ndr_pull_flags_fn_t)ndr_pull_GUID); \ - if (!NDR_ERR_CODE_IS_SUCCESS(_ndr_err)) { \ - NTSTATUS _nt_status = ndr_map_error2ntstatus(_ndr_err); \ + NTSTATUS _nt_status = GUID_from_ndr_blob(_a->value_ctr.values[0].blob, &(p)->elem); \ + if (!NT_STATUS_IS_OK(_nt_status)) { \ return ntstatus_to_werror(_nt_status); \ } \ } else { \ |