From 14cf257969a1cd793dd69214a6d255722a8a5499 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 13 Jul 2010 23:57:07 +0200 Subject: s4-smbtorture: rename rpc/bind.c to rpc/multi_bind.c. Guenther --- source4/torture/config.mk | 2 +- source4/torture/rpc/bind.c | 76 ---------------------------------------- source4/torture/rpc/multi_bind.c | 76 ++++++++++++++++++++++++++++++++++++++++ source4/torture/wscript_build | 2 +- 4 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 source4/torture/rpc/bind.c create mode 100644 source4/torture/rpc/multi_bind.c (limited to 'source4/torture') diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 09af078d80..025834fc9b 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -128,7 +128,7 @@ torture_rpc_OBJ_FILES = $(addprefix $(torturesrcdir)/rpc/, \ unixinfo.o samr.o samr_accessmask.o wkssvc.o srvsvc.o svcctl.o atsvc.o \ eventlog.o epmapper.o winreg.o initshutdown.o oxidresolve.o remact.o mgmt.o \ scanner.o autoidl.o countcalls.o testjoin.o schannel.o netlogon.o remote_pac.o samlogon.o \ - samsync.o bind.o dssetup.o alter_context.o bench.o samba3rpc.o rpc.o async_bind.o \ + samsync.o multi_bind.o dssetup.o alter_context.o bench.o samba3rpc.o rpc.o async_bind.o \ handles.o frsapi.o object_uuid.o ntsvcs.o browser.o) $(eval $(call proto_header_template,$(torturesrcdir)/rpc/proto.h,$(torture_rpc_OBJ_FILES:.o=.c))) diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c deleted file mode 100644 index 236ef2942a..0000000000 --- a/source4/torture/rpc/bind.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - dcerpc torture tests - - Copyright (C) Andrew Tridgell 2003 - Copyright (C) Andrew Bartlett . -*/ - -#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; -} diff --git a/source4/torture/rpc/multi_bind.c b/source4/torture/rpc/multi_bind.c new file mode 100644 index 0000000000..236ef2942a --- /dev/null +++ b/source4/torture/rpc/multi_bind.c @@ -0,0 +1,76 @@ +/* + Unix SMB/CIFS implementation. + + dcerpc torture tests + + Copyright (C) Andrew Tridgell 2003 + Copyright (C) Andrew Bartlett . +*/ + +#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; +} diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index 05b47e427a..bfa8b9bd58 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -40,7 +40,7 @@ bld.SAMBA_SUBSYSTEM('TORTURE_NDR', bld.SAMBA_MODULE('torture_rpc', - source='rpc/join.c rpc/lsa.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c rpc/dfs.c rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dssync.c rpc/dsgetinfo.c rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/spoolss_access.c rpc/unixinfo.c rpc/samr.c rpc/samr_accessmask.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/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', + source='rpc/join.c rpc/lsa.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c rpc/dfs.c rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dssync.c rpc/dsgetinfo.c rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/spoolss_access.c rpc/unixinfo.c rpc/samr.c rpc/samr_accessmask.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', autoproto='rpc/proto.h', subsystem='smbtorture', init_function='torture_rpc_init', -- cgit