diff options
author | Andrew Bartlett <abartlet@samba.org> | 2014-09-23 10:02:57 -0700 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2014-09-27 01:35:36 +0200 |
commit | a3ecad4237e1c4094263f31204bb8ae06669c951 (patch) | |
tree | bb8e6abc2aa9610ad290168b0ccac90abf29265e /librpc/idl/netlogon.idl | |
parent | 1ac96a416d7d6db2476f56129166fd9e018e7306 (diff) | |
download | samba-a3ecad4237e1c4094263f31204bb8ae06669c951.tar.gz |
idl: Merge NETR_TRUST and LSA_TRUST definitions into one set only in lsa.idl
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'librpc/idl/netlogon.idl')
-rw-r--r-- | librpc/idl/netlogon.idl | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl index 504933ce815..3ff7082b589 100644 --- a/librpc/idl/netlogon.idl +++ b/librpc/idl/netlogon.idl @@ -1502,30 +1502,13 @@ interface netlogon /****************/ /* Function 0x24 */ - typedef [v1_enum] enum { - NETR_TRUST_TYPE_DOWNLEVEL = 1, - NETR_TRUST_TYPE_UPLEVEL = 2, - NETR_TRUST_TYPE_MIT = 3, - NETR_TRUST_TYPE_DCE = 4 - } netr_TrustType; - - typedef [bitmap32bit] bitmap { - NETR_TRUST_ATTRIBUTE_NON_TRANSITIVE = 0x00000001, - NETR_TRUST_ATTRIBUTE_UPLEVEL_ONLY = 0x00000002, - NETR_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN = 0x00000004, - NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE = 0x00000008, - NETR_TRUST_ATTRIBUTE_CROSS_ORGANIZATION = 0x00000010, - NETR_TRUST_ATTRIBUTE_WITHIN_FOREST = 0x00000020, - NETR_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL = 0x00000040 - } netr_TrustAttributes; - typedef struct { [string,charset(UTF16)] uint16 *netbios_name; [string,charset(UTF16)] uint16 *dns_name; netr_TrustFlags trust_flags; uint32 parent_index; - netr_TrustType trust_type; - netr_TrustAttributes trust_attributes; + lsa_TrustType trust_type; + lsa_TrustAttributes trust_attributes; dom_sid2 *sid; GUID guid; } netr_DomainTrust; |