summaryrefslogtreecommitdiff
path: root/source4/torture/torture.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-09 09:26:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:41 -0500
commit4815480bb6ed44081076bac5471267609f7668cf (patch)
tree66546c6401d73d8248c7ec51762cfe60711f4571 /source4/torture/torture.c
parent3351f1aa8d0f96358d4550a154a63c7a1e542109 (diff)
downloadsamba-4815480bb6ed44081076bac5471267609f7668cf.tar.gz
samba-4815480bb6ed44081076bac5471267609f7668cf.tar.bz2
samba-4815480bb6ed44081076bac5471267609f7668cf.zip
r3633: - moved module init functions to after smb.conf and command line
parsing, so that module init can take account of lp_ parms (thats why gensec:krb5=no wasn't working) - added a BASE-DISCONNECT torture test that tests server response to clients disconnecting with open lock and open requests pending (This used to be commit 5205f598b8c0be6985e61cc842cc5da109ba5b7e)
Diffstat (limited to 'source4/torture/torture.c')
-rw-r--r--source4/torture/torture.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index daf2da9c03..ce8b79943d 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -2390,6 +2390,7 @@ static struct {
{"BASE-CHARSET", torture_charset, 0},
{"BASE-CHKPATH", torture_chkpath_test, 0},
{"BASE-SECLEAK", torture_sec_leak, 0},
+ {"BASE-DISCONNECT", torture_disconnect, 0},
/* benchmarking tests */
{"BENCH-HOLDCON", torture_holdcon, 0},
@@ -2633,8 +2634,6 @@ static BOOL is_binding_string(const char *binding_string)
POPT_TABLEEND
};
- smbtorture_init_subsystems;
-
setup_logging("smbtorture", DEBUG_STDOUT);
#ifdef HAVE_SETBUFFER
@@ -2673,6 +2672,10 @@ static BOOL is_binding_string(const char *binding_string)
lp_load(dyn_CONFIGFILE,True,False,False);
load_interfaces();
+
+ smbtorture_init_subsystems;
+
+
if (torture_seed == 0) {
torture_seed = time(NULL);
}