r24557: rename 'dcerpc_table_' -> 'ndr_table_'

[ira/wip.git] / source / torture / rpc / alter_context.c

diff --git a/source/torture/rpc/alter_context.c b/source/torture/rpc/alter_context.c
index ad00a349137841aed95b8c359bdab1b8860874ca..140d52c7463d5fb995f96abb4f810f7940120385 100644 (file)
--- a/source/torture/rpc/alter_context.c
+++ b/source/torture/rpc/alter_context.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,32 +16,31 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
+#include "librpc/rpc/dcerpc.h"
+#include "torture/rpc/rpc.h"
 
-
-BOOL torture_rpc_alter_context(void)
+BOOL torture_rpc_alter_context(struct torture_context *torture)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p, *p2;
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
-       struct policy_handle handle;
-       struct dcerpc_syntax_id syntax;
-       struct dcerpc_syntax_id transfer_syntax;
+       struct policy_handle *handle;
+       struct ndr_interface_table tmptbl;
+       struct ndr_syntax_id syntax;
+       struct ndr_syntax_id transfer_syntax;
 
        mem_ctx = talloc_init("torture_rpc_alter_context");
 
        printf("opening LSA connection\n");
-       status = torture_rpc_connection(mem_ctx, &p, 
-                                       DCERPC_LSARPC_NAME, 
-                                       DCERPC_LSARPC_UUID, 
-                                       DCERPC_LSARPC_VERSION);
+       status = torture_rpc_connection(mem_ctx, &p, &ndr_table_lsarpc);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(mem_ctx);
                return False;
@@ -52,15 +51,17 @@ BOOL torture_rpc_alter_context(void)
        }
 
        printf("Opening secondary DSSETUP context\n");
-       status = dcerpc_secondary_context(p, &p2, DCERPC_DSSETUP_UUID, DCERPC_DSSETUP_VERSION);
+       status = dcerpc_secondary_context(p, &p2, &ndr_table_dssetup);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(mem_ctx);
                printf("dcerpc_alter_context failed - %s\n", nt_errstr(status));
                return False;
        }
 
+       tmptbl = ndr_table_dssetup;
+       tmptbl.syntax_id.if_version += 100;
        printf("Opening bad secondary connection\n");
-       status = dcerpc_secondary_context(p, &p2, DCERPC_DSSETUP_UUID, DCERPC_DSSETUP_VERSION+100);
+       status = dcerpc_secondary_context(p, &p2, &tmptbl);
        if (NT_STATUS_IS_OK(status)) {
                talloc_free(mem_ctx);
                printf("dcerpc_alter_context with wrong version should fail\n");
@@ -70,8 +71,10 @@ BOOL torture_rpc_alter_context(void)
        printf("testing DSSETUP pipe operations\n");
        ret &= test_DsRoleGetPrimaryDomainInformation(p2, mem_ctx);
 
-       if (!test_lsa_Close(p, mem_ctx, &handle)) {
-               ret = False;
+       if (handle) {
+               if (!test_lsa_Close(p, mem_ctx, handle)) {
+                       ret = False;
+               }
        }
 
        syntax = p->syntax;
@@ -94,8 +97,10 @@ BOOL torture_rpc_alter_context(void)
                ret = False;
        }
 
-       if (!test_lsa_Close(p, mem_ctx, &handle)) {
-               ret = False;
+       if (handle) {
+               if (!test_lsa_Close(p, mem_ctx, handle)) {
+                       ret = False;
+               }
        }
 
        printf("testing DSSETUP pipe operations\n");