diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-17 00:45:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:34 -0500 |
| commit | 5c79bbadd5cfa921c8b4f87b5b4cafe5c488ebda (patch) | |
| tree | d3eb0f99fa809a88990b7fb0bf24ec76905e0f9b /source4/torture | |
| parent | 132310b5bf173d398243991bce5b1fb4c5dc5f96 (diff) | |
| download | samba-5c79bbadd5cfa921c8b4f87b5b4cafe5c488ebda.tar.gz samba-5c79bbadd5cfa921c8b4f87b5b4cafe5c488ebda.tar.bz2 samba-5c79bbadd5cfa921c8b4f87b5b4cafe5c488ebda.zip | |
r14497: Fix build with shared libraries
(This used to be commit c74fc55831ca24819ae7f5e0920d0351e2b46a08)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/config.mk | 2 | ||||
| -rw-r--r-- | source4/torture/local/config.mk | 1 | ||||
| -rw-r--r-- | source4/torture/rpc/rpc.c | 5 | ||||
| -rw-r--r-- | source4/torture/torture.c | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk index b6381af3f9..3b75135e6f 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -74,6 +74,8 @@ REQUIRED_SUBSYSTEMS = \ com dcom [MODULE::torture_rpc] +# TORTURE_NET and TORTURE_NBT use functions from torture_rpc... +OUTPUT_TYPE = MERGEDOBJ SUBSYSTEM = smbtorture INIT_FUNCTION = torture_rpc_init PRIVATE_PROTO_HEADER = \ diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 84d439e216..40f0e97359 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -18,6 +18,7 @@ OBJ_FILES = \ sddl.o \ ndr.o REQUIRED_SUBSYSTEMS = \ + RPC_NDR_ECHO \ LIBSMB \ MESSAGING \ registry diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index 4fe35a5cf7..1fadf4dca9 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -24,6 +24,7 @@ #include "lib/cmdline/popt_common.h" #include "torture/rpc/rpc.h" #include "torture/torture.h" +#include "librpc/rpc/dcerpc_table.h" /* open a rpc connection to the chosen binding string */ NTSTATUS torture_rpc_connection(TALLOC_CTX *parent_ctx, @@ -85,6 +86,10 @@ NTSTATUS torture_rpc_connection_transport(TALLOC_CTX *parent_ctx, NTSTATUS torture_rpc_init(void) { + dcerpc_init(); + + dcerpc_table_init(); + register_torture_op("RPC-LSA", torture_rpc_lsa, 0); register_torture_op("RPC-LSALOOKUP", torture_rpc_lsa_lookup, 0); register_torture_op("RPC-SECRETS", torture_rpc_lsa_secrets, 0); diff --git a/source4/torture/torture.c b/source4/torture/torture.c index aba6110acb..e5785fe0b3 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -31,7 +31,6 @@ #include "lib/events/events.h" #include "libcli/resolve/resolve.h" #include "auth/credentials/credentials.h" -#include "librpc/rpc/dcerpc_table.h" #include "libcli/ldap/ldap_client.h" #include "librpc/gen_ndr/ndr_nbt.h" @@ -2615,10 +2614,6 @@ static void max_runtime_handler(int sig) ldb_global_init(); - dcerpc_init(); - - dcerpc_table_init(); - if (torture_seed == 0) { torture_seed = time(NULL); } |