diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-12 09:44:27 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-12 09:44:27 +1000 |
| commit | b869a525b1f40baf881a725e5632b39c99268d67 (patch) | |
| tree | 594e53b6f5ad26e28ad8fe78d9119275e4ac319d /source4/torture/torture.c | |
| parent | 00ebe3df811a9eb7737fa6278d8784500c35bd14 (diff) | |
| parent | 5d02514f72c6c89bc28b4c5de3d95bb8a439b56e (diff) | |
| download | samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.gz samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.bz2 samba-b869a525b1f40baf881a725e5632b39c99268d67.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 61c31dc7cf649bc6f2d14bc8637e50ead9b9210a)
Diffstat (limited to 'source4/torture/torture.c')
| -rw-r--r-- | source4/torture/torture.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 8a41b72249..54fe0ead27 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -21,7 +21,6 @@ #include "includes.h" #include "system/time.h" #include "torture/torture.h" -#include "build.h" #include "lib/util/dlinklist.h" #include "param/param.h" #include "lib/cmdline/popt_common.h" @@ -60,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); |