Finish removal of iconv_convenience in public API's.

[bbaumbach/samba-autobuild/.git] / source4 / torture / unix / unix_info2.c

diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c
index 3bddde2a97ce5a78565e6f3f559d1c14cb77acdd..32cc9ac487198dcd0a8e420797a8629d483dfa51 100644 (file)
--- a/source4/torture/unix/unix_info2.c
+++ b/source4/torture/unix/unix_info2.c
@@ -19,13 +19,8 @@
 
 #include "includes.h"
 #include "libcli/libcli.h"
-#include "libcli/raw/interfaces.h"
-#include "libcli/raw/raw_proto.h"
-#include "torture/torture.h"
 #include "torture/util.h"
-#include "torture/basic/proto.h"
 #include "lib/cmdline/popt_common.h"
-#include "auth/credentials/credentials.h"
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
 
@@ -63,10 +58,11 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx)
 
        status = smbcli_full_connection(tctx, &cli, host, 
                                        lp_smb_ports(tctx->lp_ctx),
-                                       share, NULL,
+                                       share, NULL, lp_socket_options(tctx->lp_ctx),
                                        cmdline_credentials, 
                                        lp_resolve_context(tctx->lp_ctx),
-                                       tctx->ev, &options, &session_options);
+                                       tctx->ev, &options, &session_options,
+                                       lp_gensec_settings(tctx, tctx->lp_ctx));
 
        if (!NT_STATUS_IS_OK(status)) {
                printf("failed to connect to //%s/%s: %s\n",
@@ -199,9 +195,9 @@ static bool query_path_info2(void *mem_ctx,
                        -1, fname, info2);
 }
 
-static bool search_callback(void *private, const union smb_search_data *fdata)
+static bool search_callback(void *private_data, const union smb_search_data *fdata)
 {
-       struct unix_info2 *info2 = (struct unix_info2 *)private;
+       struct unix_info2 *info2 = (struct unix_info2 *)private_data;
 
        info2->end_of_file = fdata->unix_info2.end_of_file;
        info2->num_bytes = fdata->unix_info2.num_bytes;