diff options
| author | Simo Sorce <idra@samba.org> | 2010-03-23 18:45:20 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-03-23 18:47:39 -0400 |
| commit | fd2bc081381eb24bdbb82d0b1b0fbf0ae12f250a (patch) | |
| tree | b1e2e1c44da17f409fe5ef4791f07a200c4d8033 /librpc/gen_ndr/drsblobs.h | |
| parent | 247c6f53f9e2bc5dd1039e49cc92062b240ae818 (diff) | |
| download | samba-fd2bc081381eb24bdbb82d0b1b0fbf0ae12f250a.tar.gz samba-fd2bc081381eb24bdbb82d0b1b0fbf0ae12f250a.tar.bz2 samba-fd2bc081381eb24bdbb82d0b1b0fbf0ae12f250a.zip | |
idl: fix forest trust information idl
--validate now passes
Diffstat (limited to 'librpc/gen_ndr/drsblobs.h')
| -rw-r--r-- | librpc/gen_ndr/drsblobs.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/librpc/gen_ndr/drsblobs.h b/librpc/gen_ndr/drsblobs.h index 83a6978353..18ca55879b 100644 --- a/librpc/gen_ndr/drsblobs.h +++ b/librpc/gen_ndr/drsblobs.h @@ -460,8 +460,8 @@ struct ExtendedErrorInfoPtr { struct ForestTrustDataDomainInfo { uint32_t sid_size;/* [value(ndr_size_dom_sid0(&sid,ndr->flags))] */ struct dom_sid sid;/* [subcontext_size(sid_size),subcontext(0)] */ - const char * dns_name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_SIZE4)] */ - const char * netbios_name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_SIZE4)] */ + const char * dns_name;/* [flag(LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NOTERM)] */ + const char * netbios_name;/* [flag(LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NOTERM)] */ }/* [flag(LIBNDR_FLAG_NOALIGN)] */; struct ForestTrustDataBinaryData { @@ -470,7 +470,7 @@ struct ForestTrustDataBinaryData { }/* [flag(LIBNDR_FLAG_NOALIGN)] */; union ForestTrustData { - const char * name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_SIZE4),case(FOREST_TRUST_TOP_LEVEL_NAME)] */ + const char * name;/* [flag(LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NOTERM),case(FOREST_TRUST_TOP_LEVEL_NAME)] */ struct ForestTrustDataDomainInfo info;/* [case(FOREST_TRUST_DOMAIN_INFO)] */ struct ForestTrustDataBinaryData data;/* [default] */ }/* [nodiscriminant] */; @@ -491,17 +491,21 @@ enum ForestTrustInfoRecordType ; struct ForestTrustInfoRecord { - uint32_t length; uint32_t flags; NTTIME timestamp; enum ForestTrustInfoRecordType type; union ForestTrustData data;/* [switch_is(type)] */ +}/* [gensize,public,flag(LIBNDR_FLAG_NOALIGN)] */; + +struct ForestTrustInfoRecordArmor { + uint32_t record_size;/* [value(ndr_size_ForestTrustInfoRecord(&record,ndr->iconv_convenience,ndr->flags))] */ + struct ForestTrustInfoRecord record; }/* [flag(LIBNDR_FLAG_NOALIGN)] */; struct ForestTrustInfo { uint32_t version; uint32_t count; - struct ForestTrustInfoRecord *records; + struct ForestTrustInfoRecordArmor *records; }/* [public,flag(LIBNDR_FLAG_NOALIGN)] */; |