s4:torture/rpc: remove bogus rpc.multibind test
authorStefan Metzmacher <metze@samba.org>
Wed, 22 Jan 2014 11:22:30 +0000 (12:22 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 24 Mar 2014 23:45:28 +0000 (00:45 +0100)
We can later add a more useful test that tests
security context multiplexing correctly.

And another one that demonstrates that only DCERPC_BIND
must be the first (and only the first) PDU on a connection.
Otherwise DCERPC_ALTER_CONTEXT is used.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/torture/rpc/multi_bind.c [deleted file]
source4/torture/rpc/rpc.c
source4/torture/wscript_build

diff --git a/source4/torture/rpc/multi_bind.c b/source4/torture/rpc/multi_bind.c
deleted file mode 100644 (file)
index 236ef29..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   dcerpc torture tests
-
-   Copyright (C) Andrew Tridgell 2003
-   Copyright (C) Andrew Bartlett <abartlet@samba.org 2004
-
-   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 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "librpc/gen_ndr/ndr_lsa_c.h"
-#include "lib/cmdline/popt_common.h"
-#include "torture/rpc/torture_rpc.h"
-
-/*
-  This test is 'bogus' in that it doesn't actually perform to the
-  spec.  We need to deal with other things inside the DCERPC layer,
-  before we could have multiple binds.
-
-  We should never pass this test, until such details are fixed in our
-  client, and it looks like multible binds are never used anyway.
-
-*/
-
-bool torture_multi_bind(struct torture_context *torture) 
-{
-       struct dcerpc_pipe *p;
-       struct dcerpc_binding *binding;
-       TALLOC_CTX *mem_ctx;
-       NTSTATUS status;
-       bool ret;
-
-       mem_ctx = talloc_init("torture_multi_bind");
-
-       status = torture_rpc_binding(torture, &binding);
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(mem_ctx);
-               return false;
-       }
-
-       status = torture_rpc_connection(torture, &p, &ndr_table_lsarpc);
-       
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(mem_ctx);
-               return false;
-       }
-
-       status = dcerpc_pipe_auth(mem_ctx, &p, binding, &ndr_table_lsarpc, cmdline_credentials, 
-                                 torture->lp_ctx);
-
-       if (NT_STATUS_IS_OK(status)) {
-               printf("(incorrectly) allowed re-bind to uuid %s - %s\n", 
-                       GUID_string(mem_ctx, &ndr_table_lsarpc.syntax_id.uuid), nt_errstr(status));
-               ret = false;
-       } else {
-               printf("\n");
-               ret = true;
-       }
-
-       talloc_free(mem_ctx);
-
-       return ret;
-}
index 0e27a6e8646cfc5c340eba00ad0be9eef48da823..7557901efb781bcbdfd02e75976c98a7eb1ab4c7 100644 (file)
@@ -526,7 +526,6 @@ NTSTATUS torture_rpc_init(void)
        torture_suite_add_simple_test(suite, "scanner", torture_rpc_scanner);
        torture_suite_add_simple_test(suite, "autoidl", torture_rpc_autoidl);
        torture_suite_add_simple_test(suite, "countcalls", torture_rpc_countcalls);
-       torture_suite_add_simple_test(suite, "multibind", torture_multi_bind);
        torture_suite_add_simple_test(suite, "authcontext", torture_bind_authcontext);
        torture_suite_add_suite(suite, torture_rpc_samba3(suite));
        torture_rpc_drsuapi_tcase(suite);
index 61c3a091482b4a52d9a8c075cc22408bd05d1c9a..61fdfd5152788d6b800e2957775e8c6493f6988a 100755 (executable)
@@ -47,7 +47,7 @@ bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
 
 
 bld.SAMBA_MODULE('torture_rpc',
-       source='rpc/join.c rpc/lsa.c rpc/forest_trust.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c rpc/dfs.c rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dsgetinfo.c rpc/spoolss.c rpc/spoolss_win.c rpc/spoolss_access.c rpc/unixinfo.c rpc/samr.c rpc/samr_accessmask.c rpc/samr_priv.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/multi_bind.c rpc/dssetup.c rpc/alter_context.c rpc/bench.c rpc/samba3rpc.c rpc/rpc.c rpc/async_bind.c rpc/handles.c rpc/frsapi.c rpc/object_uuid.c rpc/ntsvcs.c rpc/browser.c rpc/bind.c rpc/fsrvp.c '+heimdal_specific['rpc'][0],
+       source='rpc/join.c rpc/lsa.c rpc/forest_trust.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c rpc/dfs.c rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dsgetinfo.c rpc/spoolss.c rpc/spoolss_win.c rpc/spoolss_access.c rpc/unixinfo.c rpc/samr.c rpc/samr_accessmask.c rpc/samr_priv.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/dssetup.c rpc/alter_context.c rpc/bench.c rpc/samba3rpc.c rpc/rpc.c rpc/async_bind.c rpc/handles.c rpc/frsapi.c rpc/object_uuid.c rpc/ntsvcs.c rpc/browser.c rpc/bind.c rpc/fsrvp.c '+heimdal_specific['rpc'][0],
        autoproto='rpc/proto.h',
        subsystem='smbtorture',
        init_function='torture_rpc_init',