s4-loadparm: 2nd half of lp_ to lpcfg_ conversion

[gd/samba-autobuild/.git] / source4 / torture / masktest.c

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 9ff790c2b00a20602e59305cd85346fddf4fabc5..9c66291087fb6d3f1f7e7366eb5bdcb6a719c4dc 100644 (file)
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -22,12 +22,10 @@
 #include "system/filesys.h"
 #include "system/dir.h"
 #include "libcli/libcli.h"
-#include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
-#include "dynconfig/dynconfig.h"
 #include "libcli/resolve/resolve.h"
 #include "lib/events/events.h"
 
@@ -73,13 +71,12 @@ static char *reg_test(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char
 return a connection to a server
 *******************************************************/
 static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx, 
-                                       struct event_context *ev,
+                                       struct tevent_context *ev,
                                        TALLOC_CTX *mem_ctx,
                                        char *share, const char **ports,
                                        const char *socket_options,
                                        struct smbcli_options *options,
                                        struct smbcli_session_options *session_options,
-                                       struct smb_iconv_convenience *iconv_convenience,
                                        struct gensec_settings *gensec_settings)
 {
        struct smbcli_state *c;
@@ -101,7 +98,6 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx,
                                        socket_options,
                                        cmdline_credentials, resolve_ctx, ev,
                                        options, session_options,
-                                       iconv_convenience,
                                        gensec_settings);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -298,7 +294,7 @@ static void usage(poptContext pc)
        struct smbcli_state *cli;       
        int opt;
        int seed;
-       struct event_context *ev;
+       struct tevent_context *ev;
        struct loadparm_context *lp_ctx;
        struct smbcli_options options;
        struct smbcli_session_options session_options;
@@ -335,7 +331,7 @@ static void usage(poptContext pc)
        while((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_UNCLIST:
-                       lp_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
+                       lpcfg_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
                        break;
                }
        }
@@ -368,14 +364,13 @@ static void usage(poptContext pc)
 
        gensec_init(lp_ctx);
 
-       lp_smbcli_options(lp_ctx, &options);
-       lp_smbcli_session_options(lp_ctx, &session_options);
+       lpcfg_smbcli_options(lp_ctx, &options);
+       lpcfg_smbcli_session_options(lp_ctx, &session_options);
 
-       cli = connect_one(lp_resolve_context(lp_ctx), ev, mem_ctx, share, 
-                         lp_smb_ports(lp_ctx), lp_socket_options(lp_ctx), 
+       cli = connect_one(lpcfg_resolve_context(lp_ctx), ev, mem_ctx, share,
+                         lpcfg_smb_ports(lp_ctx), lpcfg_socket_options(lp_ctx),
                          &options, &session_options,
-                         lp_iconv_convenience(lp_ctx),
-                         lp_gensec_settings(mem_ctx, lp_ctx));
+                         lpcfg_gensec_settings(mem_ctx, lp_ctx));
        if (!cli) {
                DEBUG(0,("Failed to connect to %s\n", share));
                exit(1);