s4-netlogon: merge netr_LogonControl from s3 idl.

[ira/wip.git] / source4 / torture / rpc / netlogon.c

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 7f0f60cd329b583a26f380c1c887c3940ccfd36f..755fa2538f106466d35bdcb4c8f312b4275fae31 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -869,15 +869,17 @@ static bool test_GetDcName(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_GetDcName r;
+       const char *dcname = NULL;
 
        r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.domainname = lp_workgroup(tctx->lp_ctx);
+       r.out.dcname = &dcname;
 
        status = dcerpc_netr_GetDcName(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "GetDcName");
        torture_assert_werr_ok(tctx, r.out.result, "GetDcName");
 
-       torture_comment(tctx, "\tDC is at '%s'\n", r.out.dcname);
+       torture_comment(tctx, "\tDC is at '%s'\n", dcname);
 
        return true;
 }
@@ -890,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;
@@ -916,15 +920,17 @@ static bool test_GetAnyDCName(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_GetAnyDCName r;
+       const char *dcname = NULL;
 
        r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.domainname = lp_workgroup(tctx->lp_ctx);
+       r.out.dcname = &dcname;
 
        status = dcerpc_netr_GetAnyDCName(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "GetAnyDCName");
 
-       if (r.out.dcname) {
-           torture_comment(tctx, "\tDC is at '%s'\n", r.out.dcname);
+       if (dcname) {
+           torture_comment(tctx, "\tDC is at '%s'\n", dcname);
        }
 
        return true;
@@ -1230,17 +1236,19 @@ static bool test_netr_DsRGetSiteName(struct dcerpc_pipe *p, struct torture_conte
 {
        NTSTATUS status;
        struct netr_DsRGetSiteName r;
+       const char *site = NULL;
 
        if (torture_setting_bool(tctx, "samba4", false))
                torture_skip(tctx, "skipping DsRGetSiteName test against Samba4");
 
        r.in.computer_name              = computer_name;
+       r.out.site                      = &site;
        torture_comment(tctx, "Testing netr_DsRGetSiteName\n");
 
        status = dcerpc_netr_DsRGetSiteName(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "DsRGetSiteName");
        torture_assert_werr_ok(tctx, r.out.result, "DsRGetSiteName");
-       torture_assert_str_equal(tctx, expected_site, r.out.site, "netr_DsRGetSiteName");
+       torture_assert_str_equal(tctx, expected_site, site, "netr_DsRGetSiteName");
 
        r.in.computer_name              = talloc_asprintf(tctx, "\\\\%s", computer_name);
        torture_comment(tctx, 
@@ -1261,19 +1269,21 @@ static bool test_netr_DsRGetDCName(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_DsRGetDCName r;
+       struct netr_DsRGetDCNameInfo *info = NULL;
 
        r.in.server_unc         = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.domain_name        = talloc_asprintf(tctx, "%s", lp_realm(tctx->lp_ctx));
        r.in.domain_guid        = NULL;
        r.in.site_guid          = NULL;
        r.in.flags              = DS_RETURN_DNS_NAME;
+       r.out.info              = &info;
 
        status = dcerpc_netr_DsRGetDCName(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "DsRGetDCName");
        torture_assert_werr_ok(tctx, r.out.result, "DsRGetDCName");
        return test_netr_DsRGetSiteName(p, tctx, 
-                                      r.out.info->dc_unc, 
-                                      r.out.info->dc_site_name);
+                                      info->dc_unc,
+                                      info->dc_site_name);
 }
 
 /*
@@ -1284,19 +1294,21 @@ static bool test_netr_DsRGetDCNameEx(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_DsRGetDCNameEx r;
+       struct netr_DsRGetDCNameInfo *info = NULL;
 
        r.in.server_unc         = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.domain_name        = talloc_asprintf(tctx, "%s", lp_realm(tctx->lp_ctx));
        r.in.domain_guid        = NULL;
        r.in.site_name          = NULL;
        r.in.flags              = DS_RETURN_DNS_NAME;
+       r.out.info              = &info;
 
        status = dcerpc_netr_DsRGetDCNameEx(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "netr_DsRGetDCNameEx");
        torture_assert_werr_ok(tctx, r.out.result, "netr_DsRGetDCNameEx");
 
-       return test_netr_DsRGetSiteName(p, tctx, r.out.info->dc_unc, 
-                                      r.out.info->dc_site_name);
+       return test_netr_DsRGetSiteName(p, tctx, info->dc_unc,
+                                       info->dc_site_name);
 }
 
 /*
@@ -1307,6 +1319,7 @@ static bool test_netr_DsRGetDCNameEx2(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_DsRGetDCNameEx2 r;
+       struct netr_DsRGetDCNameInfo *info = NULL;
 
        r.in.server_unc         = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.client_account     = NULL;
@@ -1315,6 +1328,7 @@ static bool test_netr_DsRGetDCNameEx2(struct torture_context *tctx,
        r.in.domain_guid        = NULL;
        r.in.site_name          = NULL;
        r.in.flags              = DS_RETURN_DNS_NAME;
+       r.out.info              = &info;
 
        torture_comment(tctx, "Testing netr_DsRGetDCNameEx2 without client account\n");
 
@@ -1326,12 +1340,13 @@ static bool test_netr_DsRGetDCNameEx2(struct torture_context *tctx,
        r.in.client_account     = TEST_MACHINE_NAME"$";
        r.in.mask               = ACB_SVRTRUST;
        r.in.flags              = DS_RETURN_FLAT_NAME;
+       r.out.info              = &info;
 
        status = dcerpc_netr_DsRGetDCNameEx2(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "netr_DsRGetDCNameEx2");
        torture_assert_werr_ok(tctx, r.out.result, "netr_DsRGetDCNameEx2");
-       return test_netr_DsRGetSiteName(p, tctx, r.out.info->dc_unc, 
-                                       r.out.info->dc_site_name);
+       return test_netr_DsRGetSiteName(p, tctx, info->dc_unc,
+                                       info->dc_site_name);
 }
 
 static bool test_netr_DsrGetDcSiteCoverageW(struct torture_context *tctx, 
@@ -1567,6 +1582,7 @@ static bool test_ManyGetDCName(struct torture_context *tctx,
        struct lsa_EnumTrustDom t;
        uint32_t resume_handle = 0;
        struct netr_GetAnyDCName d;
+       const char *dcname = NULL;
 
        int i;
 
@@ -1618,6 +1634,7 @@ static bool test_ManyGetDCName(struct torture_context *tctx,
 
        d.in.logon_server = talloc_asprintf(tctx, "\\\\%s",
                                            dcerpc_server_name(p));
+       d.out.dcname = &dcname;
 
        for (i=0; i<domains.count * 4; i++) {
                struct lsa_DomainInfo *info =
@@ -1629,7 +1646,7 @@ static bool test_ManyGetDCName(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "GetAnyDCName");
 
                torture_comment(tctx, "\tDC for domain %s is %s\n", info->name.string,
-                      d.out.dcname ? d.out.dcname : "unknown");
+                      dcname ? dcname : "unknown");
        }
 
        return true;