Rename structures to better match the names in the WSPP IDL.

[kai/samba.git] / source4 / torture / rpc / samsync.c

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 865ebf9fd21be6b8cf153cb526da9e4b5d67a5b4..1e76de1dd2b0fbdcafea8222f8b514357818e170 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -29,6 +29,7 @@
 #include "system/time.h"
 #include "torture/rpc/rpc.h"
 #include "auth/gensec/schannel_proto.h"
+#include "auth/gensec/gensec.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
@@ -345,9 +346,9 @@ static bool samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
 
        TEST_STRING_EQUAL(q[5].out.info->info5.domain_name, domain->domain_name);
        
-       TEST_STRING_EQUAL(q[2].out.info->info2.comment, domain->comment);
-       TEST_STRING_EQUAL(q[4].out.info->info4.comment, domain->comment);
-       TEST_TIME_EQUAL(q[2].out.info->info2.force_logoff_time, domain->force_logoff_time);
+       TEST_STRING_EQUAL(q[2].out.info->general.oem_information, domain->oem_information);
+       TEST_STRING_EQUAL(q[4].out.info->oem.oem_information, domain->oem_information);
+       TEST_TIME_EQUAL(q[2].out.info->general.force_logoff_time, domain->force_logoff_time);
        TEST_TIME_EQUAL(q[3].out.info->info3.force_logoff_time, domain->force_logoff_time);
 
        TEST_TIME_EQUAL(q[1].out.info->info1.min_password_length, domain->min_password_length);
@@ -1486,7 +1487,7 @@ bool torture_rpc_samsync(struct torture_context *torture)
        s.in.level = 4;
        s.in.info = talloc(mem_ctx, union samr_DomainInfo);
        
-       s.in.info->info4.comment.string
+       s.in.info->oem.oem_information.string
                = talloc_asprintf(mem_ctx, 
                                  "Tortured by Samba4: %s", 
                                  timestring(mem_ctx, time(NULL)));
@@ -1559,7 +1560,7 @@ bool torture_rpc_samsync(struct torture_context *torture)
        status = dcerpc_pipe_connect_b(samsync_state,
                                       &samsync_state->p, b, 
                                           &ndr_table_netlogon,
-                                      credentials, NULL, torture->lp_ctx);
+                                      credentials, torture->ev, torture->lp_ctx);
        
        if (!NT_STATUS_IS_OK(status)) {
                printf("Failed to connect to server as a BDC: %s\n", nt_errstr(status));
@@ -1597,7 +1598,7 @@ bool torture_rpc_samsync(struct torture_context *torture)
                                       &samsync_state->p_netlogon_wksta, 
                                       b_netlogon_wksta, 
                                           &ndr_table_netlogon,
-                                      credentials_wksta, NULL, torture->lp_ctx);
+                                      credentials_wksta, torture->ev, torture->lp_ctx);
 
        if (!NT_STATUS_IS_OK(status)) {
                printf("Failed to connect to server as a Workstation: %s\n", nt_errstr(status));
@@ -1628,9 +1629,9 @@ bool torture_rpc_samsync(struct torture_context *torture)
        }
 failed:
 
-       torture_leave_domain(join_ctx);
-       torture_leave_domain(join_ctx2);
-       torture_leave_domain(user_ctx);
+       torture_leave_domain(torture, join_ctx);
+       torture_leave_domain(torture, join_ctx2);
+       torture_leave_domain(torture, user_ctx);
 
        talloc_free(mem_ctx);