s4-netlogon: merge netr_LogonControl2 from s3 idl.
authorGünther Deschner <gd@samba.org>
Tue, 28 Oct 2008 00:02:06 +0000 (01:02 +0100)
committerGünther Deschner <gd@samba.org>
Wed, 29 Oct 2008 07:57:27 +0000 (08:57 +0100)
Guenther

source4/librpc/idl/netlogon.idl
source4/torture/rpc/netlogon.c

index 8d61c27903ea65434cbadbb8c2a95ef6599b7382..5bf8b027fa9bf08531aefe9d16d918ce0b1f8009 100644 (file)
@@ -885,8 +885,8 @@ interface netlogon
                [in,unique] [string,charset(UTF16)] uint16 *logon_server,
                [in]    netr_LogonControlCode function_code,
                [in]    uint32 level,
-               [in][switch_is(function_code)] netr_CONTROL_DATA_INFORMATION  data,
-               [out][switch_is(level)]        netr_CONTROL_QUERY_INFORMATION query
+               [in,ref][switch_is(function_code)] netr_CONTROL_DATA_INFORMATION  *data,
+               [out,ref][switch_is(level)]        netr_CONTROL_QUERY_INFORMATION *query
                );
 
 
index 755fa2538f106466d35bdcb4c8f312b4275fae31..d4cad6e57a374350b4df0026404ed718cbbe622e 100644 (file)
@@ -945,12 +945,17 @@ static bool test_LogonControl2(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_LogonControl2 r;
+       union netr_CONTROL_DATA_INFORMATION data;
+       union netr_CONTROL_QUERY_INFORMATION query;
        int i;
 
+       data.domain = lp_workgroup(tctx->lp_ctx);
+
        r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 
        r.in.function_code = NETLOGON_CONTROL_REDISCOVER;
-       r.in.data.domain = lp_workgroup(tctx->lp_ctx);
+       r.in.data = &data;
+       r.out.query = &query;
 
        for (i=1;i<4;i++) {
                r.in.level = i;
@@ -962,8 +967,10 @@ static bool test_LogonControl2(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "LogonControl");
        }
 
+       data.domain = lp_workgroup(tctx->lp_ctx);
+
        r.in.function_code = NETLOGON_CONTROL_TC_QUERY;
-       r.in.data.domain = lp_workgroup(tctx->lp_ctx);
+       r.in.data = &data;
 
        for (i=1;i<4;i++) {
                r.in.level = i;
@@ -975,8 +982,10 @@ static bool test_LogonControl2(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "LogonControl");
        }
 
+       data.domain = lp_workgroup(tctx->lp_ctx);
+
        r.in.function_code = NETLOGON_CONTROL_TRANSPORT_NOTIFY;
-       r.in.data.domain = lp_workgroup(tctx->lp_ctx);
+       r.in.data = &data;
 
        for (i=1;i<4;i++) {
                r.in.level = i;
@@ -988,8 +997,10 @@ static bool test_LogonControl2(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "LogonControl");
        }
 
+       data.debug_level = ~0;
+
        r.in.function_code = NETLOGON_CONTROL_SET_DBFLAG;
-       r.in.data.debug_level = ~0;
+       r.in.data = &data;
 
        for (i=1;i<4;i++) {
                r.in.level = i;