diff options
| author | Günther Deschner <gd@samba.org> | 2013-05-17 11:23:22 +0200 |
|---|---|---|
| committer | David Disseldorp <ddiss@samba.org> | 2013-05-20 20:35:33 +0200 |
| commit | f80d56a1a0d62c5a1cdbe78ec3214b9f53e28946 (patch) | |
| tree | d6462c363c06f76572639d8ac6532d3d321bd904 | |
| parent | 8b7788c5d8ecbac3b8a41cdbb4fec7f0e73a9b76 (diff) | |
| download | samba-f80d56a1a0d62c5a1cdbe78ec3214b9f53e28946.tar.gz samba-f80d56a1a0d62c5a1cdbe78ec3214b9f53e28946.tar.bz2 samba-f80d56a1a0d62c5a1cdbe78ec3214b9f53e28946.zip | |
s4-torture: No need to disable rpc.spoolss.win test when compiled with MIT kerberos.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Mon May 20 20:35:33 CEST 2013 on sn-devel-104
| -rw-r--r-- | source4/torture/rpc/rpc.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/spoolss_win.c | 3 | ||||
| -rwxr-xr-x | source4/torture/wscript_build | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index ad1e5492d8..2ec55b68ea 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -480,8 +480,8 @@ NTSTATUS torture_rpc_init(void) torture_suite_add_suite(suite, torture_rpc_spoolss(suite)); #ifdef AD_DC_BUILD_IS_ENABLED torture_suite_add_suite(suite, torture_rpc_spoolss_notify(suite)); - torture_suite_add_suite(suite, torture_rpc_spoolss_win(suite)); #endif + torture_suite_add_suite(suite, torture_rpc_spoolss_win(suite)); torture_suite_add_suite(suite, torture_rpc_spoolss_driver(suite)); torture_suite_add_suite(suite, torture_rpc_spoolss_access(suite)); torture_suite_add_simple_test(suite, "samr", torture_rpc_samr); diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c index bda0f3a832..c64b20e225 100644 --- a/source4/torture/rpc/spoolss_win.c +++ b/source4/torture/rpc/spoolss_win.c @@ -22,7 +22,6 @@ #include "torture/rpc/torture_rpc.h" #include "librpc/gen_ndr/ndr_spoolss_c.h" #include "librpc/gen_ndr/ndr_misc.h" -#include "ntvfs/ntvfs.h" #include "param/param.h" struct test_spoolss_win_context { @@ -462,8 +461,6 @@ static bool test_WinXP(struct torture_context *tctx, struct dcerpc_pipe *p) uint32_t i; struct dcerpc_binding_handle *b = p->binding_handle; - ntvfs_init(tctx->lp_ctx); - ctx = talloc_zero(tctx, struct test_spoolss_win_context); tmp_ctx = talloc_zero(tctx, struct test_spoolss_win_context); diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index a45bf3844c..be826104dc 100755 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -37,7 +37,7 @@ heimdal_specific['ndr'] = ('','') heimdal_specific['rpc'] = ('','') if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): heimdal_specific['ndr'] = (' ndr/backupkey.c','') - heimdal_specific['rpc'] = (' rpc/backupkey.c rpc/spoolss_notify.c rpc/spoolss_win.c', + heimdal_specific['rpc'] = (' rpc/backupkey.c rpc/spoolss_notify.c', ' RPC_NDR_BACKUPKEY SMB_SERVER dcerpc_server ntvfs') bld.SAMBA_SUBSYSTEM('TORTURE_NDR', @@ -48,7 +48,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_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/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], autoproto='rpc/proto.h', subsystem='smbtorture', init_function='torture_rpc_init', |