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

[metze/samba/wip.git] / source4 / torture / raw / openbench.c

diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index 837b7c345a620f103e36ffe43ce274244edfd044..749d157c31359af9c7b2d08fbf10fbb4c6b7374e 100644 (file)
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -130,16 +130,16 @@ static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te
 
        io->in.dest_host    = state->dest_host;
        io->in.dest_ports   = state->dest_ports;
-       io->in.socket_options = lp_socket_options(state->tctx->lp_ctx);
+       io->in.socket_options = lpcfg_socket_options(state->tctx->lp_ctx);
        io->in.called_name  = state->called_name;
        io->in.service      = share;
        io->in.service_type = state->service_type;
        io->in.credentials  = cmdline_credentials;
        io->in.fallback_to_anonymous = false;
-       io->in.workgroup    = lp_workgroup(state->tctx->lp_ctx);
-       io->in.gensec_settings = lp_gensec_settings(state->mem_ctx, state->tctx->lp_ctx);
-       lp_smbcli_options(state->tctx->lp_ctx, &io->in.options);
-       lp_smbcli_session_options(state->tctx->lp_ctx, &io->in.session_options);
+       io->in.workgroup    = lpcfg_workgroup(state->tctx->lp_ctx);
+       io->in.gensec_settings = lpcfg_gensec_settings(state->mem_ctx, state->tctx->lp_ctx);
+       lpcfg_smbcli_options(state->tctx->lp_ctx, &io->in.options);
+       lpcfg_smbcli_session_options(state->tctx->lp_ctx, &io->in.session_options);
 
        /* kill off the remnants of the old connection */
        talloc_free(state->tree);
@@ -148,7 +148,7 @@ static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te
        state->close_fnum = -1;
 
        ctx = smb_composite_connect_send(io, state->mem_ctx, 
-                                        lp_resolve_context(state->tctx->lp_ctx), 
+                                        lpcfg_resolve_context(state->tctx->lp_ctx),
                                         state->ev);
        if (ctx == NULL) {
                DEBUG(0,("Failed to setup async reconnect\n"));