s4-netlogon: merge misc stuff.

Guenther

diff --git a/source3/librpc/idl/netlogon.idl b/source3/librpc/idl/netlogon.idl
index 06e0c328d6bd003d0d0882b03c86a5c280327e35..ea8319b6202f7cb98f2d63d8d942bf4a08a6979d 100644 (file)
--- 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 d78c507c15dc376fe3a0a04cdbe30b12b105eff4..f547ec7493639c4e5d4db8192bdbcebdac0f355b 100644 (file)
--- 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;