s4-netlogon: merge netr_LogonGetDomainInfo from s3 idl.

Guenther

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 33b3c815ec289845d08552187ac9a79112dd7c35..7cb83b3d691eff0a3cad77e5d0b00ae67472801b 100644 (file)
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -1237,7 +1237,7 @@ interface netlogon
                [in,out,ref] netr_Authenticator *return_authenticator,
                [in]         uint32 level,
                [in,switch_is(level)] netr_DomainQuery query,
-               [out,switch_is(level)] netr_DomainInfo info
+               [out,ref,switch_is(level)] netr_DomainInfo *info
                );
 
        typedef [flag(NDR_PAHEX)] struct {

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 5bf60d1578fef9c6445ccbf6f442f289b9554ce6..04c16ab4845b5bbd3907ad7cc9c2dad93acc6919 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1077,7 +1077,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
                NETR_WS_FLAG_HANDLES_INBOUND_TRUSTS | NETR_WS_FLAG_HANDLES_SPN_UPDATE;
        info1->supported_enc_types = 0; /* w2008 gives this 0 */
 
-       r->out.info.info1 = info1;
+       r->out.info->info1 = info1;
 
        return NT_STATUS_OK;
 }

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index ce45065ac82e228351a5097fc5b320fb2231ca09..232d10323c201fbfc8bb543bcef518a75690bb69 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -1452,6 +1452,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
        struct netr_DomainQuery1 q1;
        struct netr_Authenticator a;
        struct creds_CredentialState *creds;
+       union netr_DomainInfo info;
 
        if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, 
                                    machine_credentials, &creds)) {
@@ -1468,6 +1469,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
        r.in.credential = &a;
        r.in.return_authenticator = &a;
        r.out.return_authenticator = &a;
+       r.out.info = &info;
 
        r.in.query.query1 = &q1;
        ZERO_STRUCT(q1);
@@ -1519,6 +1521,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
        struct rpc_request *req[ASYNC_COUNT];
        int i;
        int *async_counter = talloc(tctx, int);
+       union netr_DomainInfo info;
 
        if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, 
                                    machine_credentials, &creds)) {
@@ -1532,6 +1535,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
        r.in.credential = &a;
        r.in.return_authenticator = &a;
        r.out.return_authenticator = &a;
+       r.out.info = &info;
 
        r.in.query.query1 = &q1;
        ZERO_STRUCT(q1);