summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-12-30 22:46:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:06 -0500
commitaa9f67163cd2df2a815ef585edad1951343b82c8 (patch)
tree88058f98a5681563c745a9e3239469b61e11648f /source4/torture
parent5a26b2d72b63f0b3d8d4aa151044521fdf8c2064 (diff)
downloadsamba-aa9f67163cd2df2a815ef585edad1951343b82c8.tar.gz
samba-aa9f67163cd2df2a815ef585edad1951343b82c8.tar.bz2
samba-aa9f67163cd2df2a815ef585edad1951343b82c8.zip
r12620: Get rid of automatically generated lists of init functions of subsystems.
This allows Samba libraries to be used by other projects (and parts of Samba to be built as shared libraries). (This used to be commit 44f0aba715bfedc7e1ee3d07e9a101a91dbd84b3)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/com/simple.c2
-rw-r--r--source4/torture/gentest.c4
-rw-r--r--source4/torture/locktest.c4
-rw-r--r--source4/torture/masktest.c4
-rw-r--r--source4/torture/torture.c3
5 files changed, 9 insertions, 8 deletions
diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c
index 09061422f5..5d3c6250c4 100644
--- a/source4/torture/com/simple.c
+++ b/source4/torture/com/simple.c
@@ -38,6 +38,8 @@ static BOOL test_readwrite(TALLOC_CTX *mem_ctx, const char *host)
char test_data[5];
int i;
+ com_init();
+
com_init_ctx(&ctx, NULL);
dcom_client_init(ctx, cmdline_credentials);
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index d466671252..a576b57458 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -24,7 +24,7 @@
#include "request.h"
#include "libcli/raw/libcliraw.h"
#include "librpc/gen_ndr/ndr_security.h"
-#include "smb_build.h"
+#include "auth/gensec/gensec.h"
#define NSERVERS 2
#define NINSTANCES 2
@@ -2234,7 +2234,7 @@ static void usage(void)
}
}
- gentest_init_subsystems;
+ gensec_init();
if (username_count == 0) {
usage();
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index a94a6f1ec9..be2d3022da 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -22,7 +22,7 @@
#include "system/filesys.h"
#include "system/time.h"
#include "pstring.h"
-#include "smb_build.h"
+#include "auth/gensec/gensec.h"
static int numops = 1000;
static BOOL showall;
@@ -550,7 +550,7 @@ static void usage(void)
servers[1] = servers[0];
}
- locktest_init_subsystems;
+ gensec_init();
argc -= optind;
argv += optind;
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 5e8f973c4c..ca5bdf7c21 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -24,7 +24,7 @@
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
#include "pstring.h"
-#include "smb_build.h"
+#include "auth/gensec/gensec.h"
static struct cli_credentials *credentials;
static BOOL showall = False;
@@ -353,7 +353,7 @@ static void usage(void)
}
}
- masktest_init_subsystems;
+ gensec_init();
argc -= optind;
argv += optind;
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 149ee78065..82fda0d4ff 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -25,7 +25,6 @@
#include "system/wait.h"
#include "system/filesys.h"
#include "ioctl.h"
-#include "smb_build.h"
int torture_nprocs=4;
int torture_numops=10;
@@ -2609,7 +2608,7 @@ static void max_runtime_handler(int sig)
alarm(max_runtime);
}
- smbtorture_init_subsystems;
+ dcerpc_init();
dcerpc_table_init();