s4-netlogon: merge netr_DsrGetDcSiteCoverageW from s3 idl.

[ira/wip.git] / source4 / librpc / idl / netlogon.idl

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 1a164e398f04a7227080f80011c369c1e1756b18..400565ba22abccb7962be8681a2a4b9a2289683c 100644 (file)
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -46,7 +46,7 @@ interface netlogon
                [in,unique] [string,charset(UTF16)] uint16 *server_name,
                [in]   [string,charset(UTF16)] uint16 account_name[],
                [in]   [string,charset(UTF16)] uint16 workstation[],
-               [out,ref]  netr_UasInfo *info
+               [out,ref]  netr_UasInfo **info
                );
 
 
@@ -155,11 +155,11 @@ interface netlogon
        typedef [public,switch_type(netr_LogonInfoClass)] union {
                [case(NetlogonInteractiveInformation)]           netr_PasswordInfo *password;
                [case(NetlogonNetworkInformation)]               netr_NetworkInfo  *network;
-               [case(NetlogonServiceInformation)]               netr_PasswordInfo *password;
-               [case(NetlogonGenericInformation)]               netr_GenericInfo  *generic;
+               [case(NetlogonServiceInformation)]               netr_PasswordInfo *password;
+               [case(NetlogonGenericInformation)]               netr_GenericInfo  *generic;
                [case(NetlogonInteractiveTransitiveInformation)] netr_PasswordInfo *password;
                [case(NetlogonNetworkTransitiveInformation)]     netr_NetworkInfo  *network;
-               [case(NetlogonServiceTransitiveInformation)]     netr_PasswordInfo *password;
+               [case(NetlogonServiceTransitiveInformation)]     netr_PasswordInfo *password;
        } netr_LogonLevel;
 
        typedef [public,flag(NDR_PAHEX)] struct {
@@ -304,7 +304,7 @@ interface netlogon
                [in,unique] [string,charset(UTF16)] uint16 *computer_name,
                [in,unique] netr_Authenticator *credential,
                [in,out,unique] netr_Authenticator *return_authenticator,
-               [in] uint16 logon_level,
+               [in] netr_LogonInfoClass logon_level,
                [in] [switch_is(logon_level)] netr_LogonLevel logon
                );
        
@@ -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;
@@ -1374,7 +1374,7 @@ interface netlogon
 
        WERROR netr_DsrGetDcSiteCoverageW(
                [in,unique] [string,charset(UTF16)] uint16 *server_name,
-               [out,unique] DcSitesCtr *ctr
+               [out,ref] DcSitesCtr **ctr
                );
 
        /****************/
@@ -1382,7 +1382,7 @@ interface netlogon
        NTSTATUS netr_LogonSamLogonEx(
                [in,unique] [string,charset(UTF16)] uint16 *server_name,
                [in,unique] [string,charset(UTF16)] uint16 *computer_name,
-               [in]  uint16 logon_level,
+               [in]  netr_LogonInfoClass logon_level,
                [in]  [switch_is(logon_level)] netr_LogonLevel logon,
                [in]  uint16 validation_level,
                [out] [switch_is(validation_level)] netr_Validation validation,
@@ -1456,7 +1456,7 @@ interface netlogon
                [in,unique] [string,charset(UTF16)] uint16 *computer_name,
                [in,unique] netr_Authenticator *credential,
                [in,out,unique] netr_Authenticator *return_authenticator,
-               [in]  uint16 logon_level,
+               [in]  netr_LogonInfoClass logon_level,
                [in]  [switch_is(logon_level)] netr_LogonLevel logon,
                [in]  uint16 validation_level,
                [out] [switch_is(validation_level)] netr_Validation validation,