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,