Author: metze Date: 2006-12-20 14:44:14 +0000 (Wed, 20 Dec 2006) New Revision: 20280
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20280 Log: if the uint8_t array starts with 0xFF, then it's not a OID and we return the array as hexstring. this is always in the last array member of the meppings array, and I is always 21 bytes long w2k in mixed mode: FF0000000000000000000000000000000000000000 w2k3 in mixed mode: FF00000002A5DA73B101C43B449028E2F832FE466F w2k3 in native mode: FF00000001635D94BDE62E2C4C9BAC9D6AFA4F69F8 I assume it's some kind of schema version... metze Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c Changeset: Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c =================================================================== --- branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c 2006-12-20 14:23:41 UTC (rev 20279) +++ branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c 2006-12-20 14:44:14 UTC (rev 20280) @@ -124,10 +124,7 @@ if (r->oid) { DATA_BLOB _oid_array; const char *_oid; - struct asn1_data _asn1; - ZERO_STRUCT(_asn1); - _mem_save_oid_0 = NDR_PULL_GET_MEM_CTX(ndr); NDR_PULL_SET_MEM_CTX(ndr, ndr, 0); NDR_CHECK(ndr_pull_array_size(ndr, &r->oid)); @@ -136,15 +133,26 @@ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, _oid_array.data, _oid_array.length)); NDR_PULL_SET_MEM_CTX(ndr, _mem_save_oid_0, 0); - _ASN1_PULL_CHECK(asn1_load(&_asn1, _oid_array)); - talloc_steal(ndr, _asn1.data); - data_blob_free(&_oid_array); - _ASN1_PULL_CHECK(asn1_start_fake_tag(&_asn1)); - _ASN1_PULL_CHECK(asn1_read_OID_String(&_asn1, &_oid)); - talloc_steal(r->oid, _oid); - r->oid = _oid; - _ASN1_PULL_CHECK(asn1_end_tag(&_asn1)); - asn1_free(&_asn1); + if (_oid_array.length && _oid_array.data[0] == 0xFF) { + _oid = data_blob_hex_string(ndr, &_oid_array); + NT_STATUS_HAVE_NO_MEMORY(_oid); + data_blob_free(&_oid_array); + talloc_steal(r->oid, _oid); + r->oid = _oid; + } else { + struct asn1_data _asn1; + ZERO_STRUCT(_asn1); + _ASN1_PULL_CHECK(asn1_load(&_asn1, _oid_array)); + talloc_steal(ndr, _asn1.data); + data_blob_free(&_oid_array); + _ASN1_PULL_CHECK(asn1_start_fake_tag(&_asn1)); + _ASN1_PULL_CHECK(asn1_read_OID_String(&_asn1, &_oid)); + talloc_steal(r->oid, _oid); + r->oid = _oid; + _ASN1_PULL_CHECK(asn1_end_tag(&_asn1)); + asn1_free(&_asn1); + } + DEBUG(0,("oid: %s\n", r->oid)); } if (r->oid) { NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->oid, r->__ndr_size));
