diff options
author | Günther Deschner <gd@samba.org> | 2008-10-28 01:06:31 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2008-10-28 23:37:40 +0100 |
commit | 98f8f891643d356eaf67206f5606aa2ed82c96ce (patch) | |
tree | 154b8fccd87be7d0913491e07a033a89956f44d9 | |
parent | 67c5aca1e871ccd3675a0cc586753134f76239e9 (diff) | |
download | samba-98f8f891643d356eaf67206f5606aa2ed82c96ce.tar.gz samba-98f8f891643d356eaf67206f5606aa2ed82c96ce.tar.bz2 samba-98f8f891643d356eaf67206f5606aa2ed82c96ce.zip |
s4-netlogon: merge misc stuff.
Guenther
-rw-r--r-- | source3/librpc/idl/netlogon.idl | 6 | ||||
-rw-r--r-- | source4/librpc/idl/netlogon.idl | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/librpc/idl/netlogon.idl b/source3/librpc/idl/netlogon.idl index 06e0c328d6..ea8319b620 100644 --- a/source3/librpc/idl/netlogon.idl +++ b/source3/librpc/idl/netlogon.idl @@ -313,7 +313,7 @@ interface netlogon /*****************/ /* Function 0x04 */ - NTSTATUS netr_ServerReqChallenge( + [public] NTSTATUS netr_ServerReqChallenge( [in,unique,string,charset(UTF16)] uint16 *server_name, [in,string,charset(UTF16)] uint16 computer_name[], [in,ref] netr_Credential *credentials, @@ -1107,7 +1107,7 @@ interface netlogon /****************/ /* Function 0x1a */ - NTSTATUS netr_ServerAuthenticate3( + [public] NTSTATUS netr_ServerAuthenticate3( [in,unique] [string,charset(UTF16)] uint16 *server_name, [in] [string,charset(UTF16)] uint16 account_name[], [in] netr_SchannelType secure_channel_type, @@ -1129,6 +1129,7 @@ interface netlogon [out,ref] netr_DsRGetDCNameInfo **info ); + /****************/ /* Function 0x1c */ WERROR netr_DsRGetSiteName( @@ -1313,6 +1314,7 @@ interface netlogon /****************/ /* Function 0x24 */ + typedef [v1_enum] enum { NETR_TRUST_TYPE_DOWNLEVEL = 1, NETR_TRUST_TYPE_UPLEVEL = 2, diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl index d78c507c15..f547ec7493 100644 --- a/source4/librpc/idl/netlogon.idl +++ b/source4/librpc/idl/netlogon.idl @@ -824,7 +824,7 @@ interface netlogon typedef struct { netr_InfoFlags flags; uint32 pdc_connection_status; - [string,charset(UTF16)] uint16 trusted_dc_name[]; + [string,charset(UTF16)] uint16 *trusted_dc_name; uint32 tc_connection_status; } netr_NETLOGON_INFO_2; @@ -1057,7 +1057,7 @@ interface netlogon DS_DNS_FOREST = 0x80000000 } netr_DsR_DcFlags; - typedef struct { + typedef [public] struct { [string,charset(UTF16)] uint16 *dc_unc; [string,charset(UTF16)] uint16 *dc_address; netr_DsRGetDCNameInfo_AddressType dc_address_type; |