s4-netlogon: merge netr_LogonControl from s3 idl.

Guenther

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index d3a2945671a1811fccbe6c1b17972ac57afbb063..8d61c27903ea65434cbadbb8c2a95ef6599b7382 100644 (file)
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -857,7 +857,7 @@ interface netlogon
                [in,unique] [string,charset(UTF16)] uint16 *logon_server,
                [in]   netr_LogonControlCode function_code,
                [in]   uint32 level,
-               [out,switch_is(level)]  netr_CONTROL_QUERY_INFORMATION info
+               [out,ref,switch_is(level)]  netr_CONTROL_QUERY_INFORMATION *info
                );
 
 

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index f23af7e72a69e6a9cfd922a388fcb61b8d9d9c6e..755fa2538f106466d35bdcb4c8f312b4275fae31 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -892,10 +892,12 @@ static bool test_LogonControl(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_LogonControl r;
+       union netr_CONTROL_QUERY_INFORMATION info;
        int i;
 
        r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.function_code = 1;
+       r.out.info = &info;
 
        for (i=1;i<4;i++) {
                r.in.level = i;