mirror of
https://github.com/samba-team/samba.git
synced 2025-02-23 09:57:40 +03:00
Fix torture module initializion.
(This used to be commit d5bf4e9065303b54421a6f35b213a22f062d27d4)
This commit is contained in:
parent
08ad86ad3d
commit
670122d724
@ -10,7 +10,7 @@ LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \
|
||||
|
||||
|
||||
[MODULE::TORTURE_LIBCRYPTO]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
PRIVATE_DEPENDENCIES = LIBCRYPTO
|
||||
PRIVATE_PROTO_HEADER = test_proto.h
|
||||
|
||||
|
@ -7,7 +7,7 @@ TORTURE_UTIL_OBJ_FILES = $(addprefix torture/, util_smb.o)
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_BASIC
|
||||
[MODULE::TORTURE_BASIC]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_base_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
basic/proto.h
|
||||
@ -42,7 +42,7 @@ TORTURE_BASIC_OBJ_FILES = $(addprefix torture/basic/, \
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_RAW
|
||||
[MODULE::TORTURE_RAW]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_raw_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
raw/proto.h
|
||||
@ -97,7 +97,7 @@ TORTURE_NDR_OBJ_FILES = $(addprefix torture/ndr/, ndr.o winreg.o atsvc.o lsa.o e
|
||||
[MODULE::torture_rpc]
|
||||
# TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
|
||||
#OUTPUT_TYPE = MERGED_OBJ
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_rpc_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
rpc/proto.h
|
||||
@ -123,7 +123,7 @@ torture_rpc_OBJ_FILES = $(addprefix torture/rpc/, \
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_RAP
|
||||
[MODULE::TORTURE_RAP]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_rap_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
rap/proto.h
|
||||
@ -136,7 +136,7 @@ TORTURE_RAP_OBJ_FILES = torture/rap/rap.o
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_AUTH
|
||||
[MODULE::TORTURE_AUTH]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
auth/proto.h
|
||||
PRIVATE_DEPENDENCIES = \
|
||||
@ -152,7 +152,7 @@ mkinclude local/config.mk
|
||||
#################################
|
||||
# Start MODULE TORTURE_NBENCH
|
||||
[MODULE::TORTURE_NBENCH]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_nbench_init
|
||||
PRIVATE_DEPENDENCIES = TORTURE_UTIL
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
@ -165,7 +165,7 @@ TORTURE_NBENCH_OBJ_FILES = $(addprefix torture/nbench/, nbio.o nbench.o)
|
||||
#################################
|
||||
# Start MODULE TORTURE_UNIX
|
||||
[MODULE::TORTURE_UNIX]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_unix_init
|
||||
PRIVATE_DEPENDENCIES = TORTURE_UTIL
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
@ -178,7 +178,7 @@ TORTURE_UNIX_OBJ_FILES = $(addprefix torture/unix/, unix.o whoami.o unix_info2.o
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_LDAP
|
||||
[MODULE::TORTURE_LDAP]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_ldap_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
ldap/proto.h
|
||||
@ -193,7 +193,7 @@ TORTURE_LDAP_OBJ_FILES = $(addprefix torture/ldap/, common.o basic.o schema.o up
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_NBT
|
||||
[MODULE::TORTURE_NBT]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_nbt_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
nbt/proto.h
|
||||
@ -209,7 +209,7 @@ TORTURE_NBT_OBJ_FILES = $(addprefix torture/nbt/, query.o register.o \
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_NET
|
||||
[MODULE::TORTURE_NET]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_net_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
libnet/proto.h
|
||||
|
@ -1,7 +1,7 @@
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_LOCAL
|
||||
[MODULE::TORTURE_LOCAL]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_local_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
proto.h
|
||||
|
@ -2,7 +2,7 @@
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_SMB2
|
||||
[MODULE::TORTURE_SMB2]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_smb2_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
proto.h
|
||||
|
@ -59,7 +59,7 @@ _PUBLIC_ int torture_init(void)
|
||||
extern NTSTATUS torture_raw_init(void);
|
||||
extern NTSTATUS torture_unix_init(void);
|
||||
extern NTSTATUS torture_winbind_init(void);
|
||||
init_module_fn static_init[] = { STATIC_torture_MODULES };
|
||||
init_module_fn static_init[] = { STATIC_smbtorture_MODULES };
|
||||
init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "torture");
|
||||
|
||||
run_init_functions(static_init);
|
||||
|
@ -2,7 +2,7 @@
|
||||
#################################
|
||||
# Start SUBSYSTEM TORTURE_WINBIND
|
||||
[MODULE::TORTURE_WINBIND]
|
||||
SUBSYSTEM = torture
|
||||
SUBSYSTEM = smbtorture
|
||||
INIT_FUNCTION = torture_winbind_init
|
||||
PRIVATE_PROTO_HEADER = \
|
||||
proto.h
|
||||
|
Loading…
x
Reference in New Issue
Block a user