s4:torture/samba3rpc: use pipe_bind_smb2()
authorStefan Metzmacher <metze@samba.org>
Thu, 16 Jan 2014 06:19:49 +0000 (07:19 +0100)
committerGünther Deschner <gd@samba.org>
Tue, 7 Jul 2015 12:05:28 +0000 (14:05 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
source4/torture/rpc/samba3rpc.c

index c5cb877b09db6b9f19ebcedcaa858421b6f2c025..cfc5b4f217a374eafd326cf3b3f50c55770d7896 100644 (file)
@@ -3720,18 +3720,11 @@ static bool torture_rpc_smb2_reauth1(struct torture_context *torture)
        torture_assert_ntstatus_ok_goto(torture, status, ret, done,
                                        "smb2_connect failed");
 
-       lsa_pipe = dcerpc_pipe_init(mem_ctx, torture->ev);
-       torture_assert_goto(torture, (lsa_pipe != NULL), ret, done,
-                           "dcerpc_pipe_init failed");
-       lsa_handle = lsa_pipe->binding_handle;
-
-       status = dcerpc_pipe_open_smb2(lsa_pipe, tree, "lsarpc");
+       status = pipe_bind_smb2(torture, mem_ctx, tree, "lsarpc",
+                               &ndr_table_lsarpc, &lsa_pipe);
        torture_assert_ntstatus_ok_goto(torture, status, ret, done,
-                                       "dcerpc_pipe_open_smb2 failed");
-
-       status = dcerpc_bind_auth_none(lsa_pipe, &ndr_table_lsarpc);
-       torture_assert_ntstatus_ok_goto(torture, status, ret, done,
-                                       "dcerpc_bind_auth_none failed");
+                                       "pipe_bind_smb2 failed");
+       lsa_handle = lsa_pipe->binding_handle;
 
        /* lsa getusername */
 
@@ -3889,18 +3882,11 @@ static bool torture_rpc_smb2_reauth2(struct torture_context *torture)
 
        /* open the lsa pipe */
 
-       lsa_pipe = dcerpc_pipe_init(mem_ctx, torture->ev);
-       torture_assert_goto(torture, (lsa_pipe != NULL), ret, done,
-                           "dcerpc_pipe_init failed");
-       lsa_handle = lsa_pipe->binding_handle;
-
-       status = dcerpc_pipe_open_smb2(lsa_pipe, tree, "lsarpc");
+       status = pipe_bind_smb2(torture, mem_ctx, tree, "lsarpc",
+                               &ndr_table_lsarpc, &lsa_pipe);
        torture_assert_ntstatus_ok_goto(torture, status, ret, done,
-                                       "dcerpc_pipe_open_smb2 failed");
-
-       status = dcerpc_bind_auth_none(lsa_pipe, &ndr_table_lsarpc);
-       torture_assert_ntstatus_ok_goto(torture, status, ret, done,
-                                       "dcerpc_bind_auth_none failed");
+                                       "pipe_bind_smb2 failed");
+       lsa_handle = lsa_pipe->binding_handle;
 
        /* lsa getusername */