diff options
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/config.mk | 13 | ||||
| -rw-r--r-- | source4/torture/local/config.mk | 2 | ||||
| -rw-r--r-- | source4/torture/smb2/config.mk | 1 | ||||
| -rw-r--r-- | source4/torture/torture.c | 2 | ||||
| -rw-r--r-- | source4/torture/winbind/config.mk | 3 |
5 files changed, 18 insertions, 3 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 71fa391003..895fef6174 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -9,6 +9,7 @@ TORTURE_UTIL_OBJ_FILES = $(addprefix $(torturesrcdir)/, util_smb.o) [MODULE::TORTURE_BASIC] SUBSYSTEM = smbtorture INIT_FUNCTION = torture_base_init +OUTPUT_TYPE = MERGED_OBJ PRIVATE_DEPENDENCIES = \ LIBCLI_SMB POPT_CREDENTIALS \ TORTURE_UTIL LIBCLI_RAW \ @@ -41,6 +42,7 @@ $(eval $(call proto_header_template,$(torturesrcdir)/basic/proto.h,$(TORTURE_BAS ################################# # Start SUBSYSTEM TORTURE_RAW [MODULE::TORTURE_RAW] +OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = smbtorture INIT_FUNCTION = torture_raw_init PRIVATE_DEPENDENCIES = \ @@ -89,13 +91,14 @@ mkinclude smb2/config.mk mkinclude winbind/config.mk [SUBSYSTEM::TORTURE_NDR] -PRIVATE_DEPENDENCIES = torture +PRIVATE_DEPENDENCIES = torture SERVICE_SMB TORTURE_NDR_OBJ_FILES = $(addprefix $(torturesrcdir)/ndr/, ndr.o winreg.o atsvc.o lsa.o epmap.o dfs.o netlogon.o drsuapi.o spoolss.o samr.o) $(eval $(call proto_header_template,$(torturesrcdir)/ndr/proto.h,$(TORTURE_NDR_OBJ_FILES:.o=.c))) [MODULE::torture_rpc] +OUTPUT_TYPE = MERGED_OBJ # TORTURE_NET and TORTURE_NBT use functions from torture_rpc... #OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = smbtorture @@ -124,6 +127,7 @@ $(eval $(call proto_header_template,$(torturesrcdir)/rpc/proto.h,$(torture_rpc_O ################################# # Start SUBSYSTEM TORTURE_RAP [MODULE::TORTURE_RAP] +OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = smbtorture INIT_FUNCTION = torture_rap_init PRIVATE_DEPENDENCIES = TORTURE_UTIL LIBCLI_SMB @@ -137,6 +141,7 @@ $(eval $(call proto_header_template,$(torturesrcdir)/rap/proto.h,$(TORTURE_RAP_O ################################# # Start SUBSYSTEM TORTURE_AUTH [MODULE::TORTURE_AUTH] +OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = smbtorture PRIVATE_DEPENDENCIES = \ LIBCLI_SMB gensec auth KERBEROS \ @@ -153,6 +158,7 @@ mkinclude local/config.mk ################################# # Start MODULE TORTURE_NBENCH [MODULE::TORTURE_NBENCH] +OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = smbtorture INIT_FUNCTION = torture_nbench_init PRIVATE_DEPENDENCIES = TORTURE_UTIL @@ -167,6 +173,7 @@ $(eval $(call proto_header_template,$(torturesrcdir)/nbench/proto.h,$(TORTURE_NB # Start MODULE TORTURE_UNIX [MODULE::TORTURE_UNIX] SUBSYSTEM = smbtorture +OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = torture_unix_init PRIVATE_DEPENDENCIES = TORTURE_UTIL # End MODULE TORTURE_UNIX @@ -180,6 +187,7 @@ $(eval $(call proto_header_template,$(torturesrcdir)/unix/proto.h,$(TORTURE_UNIX # Start SUBSYSTEM TORTURE_LDAP [MODULE::TORTURE_LDAP] SUBSYSTEM = smbtorture +OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = torture_ldap_init PRIVATE_DEPENDENCIES = \ LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture @@ -194,6 +202,7 @@ $(eval $(call proto_header_template,$(torturesrcdir)/ldap/proto.h,$(TORTURE_LDAP # Start SUBSYSTEM TORTURE_LDB [MODULE::TORTURE_LDB] SUBSYSTEM = smbtorture +OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = torture_ldb_init PRIVATE_DEPENDENCIES = \ LDB_WRAP @@ -208,6 +217,7 @@ $(eval $(call proto_header_template,$(torturesrcdir)/ldb/proto.h,$(TORTURE_LDB_O # Start SUBSYSTEM TORTURE_NBT [MODULE::TORTURE_NBT] SUBSYSTEM = smbtorture +OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = torture_nbt_init PRIVATE_DEPENDENCIES = \ LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL torture_rpc @@ -223,6 +233,7 @@ $(eval $(call proto_header_template,$(torturesrcdir)/nbt/proto.h,$(TORTURE_NBT_O # Start SUBSYSTEM TORTURE_NET [MODULE::TORTURE_NET] SUBSYSTEM = smbtorture +OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = torture_net_init PRIVATE_DEPENDENCIES = \ LIBSAMBA-NET \ diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 60cbf25eda..36f4f08072 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -2,6 +2,7 @@ # Start SUBSYSTEM TORTURE_LOCAL [MODULE::TORTURE_LOCAL] SUBSYSTEM = smbtorture +OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = torture_local_init PRIVATE_DEPENDENCIES = \ RPC_NDR_ECHO \ @@ -13,6 +14,7 @@ PRIVATE_DEPENDENCIES = \ TORTURE_AUTH \ TORTURE_UTIL \ TORTURE_NDR \ + TORTURE_LIBCRYPTO \ share \ torture_registry \ PROVISION diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk index 3a1ac5e06c..e0fc29f278 100644 --- a/source4/torture/smb2/config.mk +++ b/source4/torture/smb2/config.mk @@ -3,6 +3,7 @@ # Start SUBSYSTEM TORTURE_SMB2 [MODULE::TORTURE_SMB2] SUBSYSTEM = smbtorture +OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = torture_smb2_init PRIVATE_DEPENDENCIES = \ LIBCLI_SMB2 POPT_CREDENTIALS torture diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 3f9a6607cf..deae65c265 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -62,7 +62,7 @@ _PUBLIC_ int torture_init(void) extern NTSTATUS torture_unix_init(void); extern NTSTATUS torture_winbind_init(void); init_module_fn static_init[] = { STATIC_smbtorture_MODULES }; - init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "torture"); + init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "smbtorture"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/torture/winbind/config.mk b/source4/torture/winbind/config.mk index 9648a7472b..d2c57e9c97 100644 --- a/source4/torture/winbind/config.mk +++ b/source4/torture/winbind/config.mk @@ -3,9 +3,10 @@ # Start SUBSYSTEM TORTURE_WINBIND [MODULE::TORTURE_WINBIND] SUBSYSTEM = smbtorture +OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = torture_winbind_init PRIVATE_DEPENDENCIES = \ - LIBWINBIND-CLIENT torture + LIBWINBIND-CLIENT torture PAM_ERRORS # End SUBSYSTEM TORTURE_WINBIND ################################# |