summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-30 05:37:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:06:15 -0500
commit607e3022381ab089bfcc0b153461b6b3ac76f175 (patch)
tree2b29f170a778868b877f38a902408eb1e68721e3 /source4/torture
parentc33283df20df633ce969ea71bbfb6f62af35fdd9 (diff)
downloadsamba-607e3022381ab089bfcc0b153461b6b3ac76f175.tar.gz
samba-607e3022381ab089bfcc0b153461b6b3ac76f175.tar.bz2
samba-607e3022381ab089bfcc0b153461b6b3ac76f175.zip
r4013: got rid of a bunch of unused or unmaintained code
- removed the clitar code. It is unmaintained, and a horribly badly done hack - removed client.h as it contained mostly unused definitions - removed the unused clidfs.c code (This used to be commit 31a7bddbb3815b4d625e993dbce4805dae1c18f8)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/basic/dir.c2
-rw-r--r--source4/torture/masktest.c4
-rw-r--r--source4/torture/torture.c6
3 files changed, 4 insertions, 8 deletions
diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index 0f962e6cf1..1394ef5b5b 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -23,7 +23,7 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_security.h"
-static void list_fn(struct file_info *finfo, const char *name, void *state)
+static void list_fn(struct clilist_file_info *finfo, const char *name, void *state)
{
}
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index c0890118c3..ee15f92d80 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "dynconfig.h"
-#include "client.h"
+#include "clilist.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
@@ -98,7 +98,7 @@ static struct {
} last_hit;
static BOOL f_info_hit;
-static void listfn(struct file_info *f, const char *s, void *state)
+static void listfn(struct clilist_file_info *f, const char *s, void *state)
{
if (strcmp(f->name,".") == 0) {
resultp[0] = '+';
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index ca8c3342b6..43f276e0c2 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "dynconfig.h"
-#include "client.h"
+#include "clilist.h"
#include "lib/cmdline/popt_common.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
@@ -37,7 +37,6 @@ static int procnum; /* records process count number when forking */
static struct smbcli_state *current_cli;
static BOOL use_oplocks;
static BOOL use_level_II_oplocks;
-static BOOL use_kerberos;
BOOL torture_showall = False;
@@ -99,9 +98,6 @@ BOOL torture_open_connection_share(struct smbcli_state **c,
const char *userdomain = lp_parm_string(-1, "torture", "userdomain");
const char *password = lp_parm_string(-1, "torture", "password");
- if (use_kerberos)
- flags |= SMBCLI_FULL_CONNECTION_USE_KERBEROS;
-
status = smbcli_full_connection(NULL,
c, lp_netbios_name(),
hostname, NULL,