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

[bbaumbach/samba-autobuild/.git] / source4 / torture / raw / composite.c

diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index bcc030b5ab3338c81d6c01193739ae6034de944a..3a828d868a9126008dde316377b5904dac0ac894 100644 (file)
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -154,18 +154,18 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct
        }
 
        io2.in.dest_host = torture_setting_string(tctx, "host", NULL);
-       io2.in.ports = lp_smb_ports(tctx->lp_ctx);
+       io2.in.ports = lpcfg_smb_ports(tctx->lp_ctx);
        io2.in.called_name = torture_setting_string(tctx, "host", NULL);
        io2.in.service = torture_setting_string(tctx, "share", NULL);
        io2.in.service_type = "A:";
 
        io2.in.credentials = cmdline_credentials;
-       io2.in.workgroup  = lp_workgroup(tctx->lp_ctx);
+       io2.in.workgroup  = lpcfg_workgroup(tctx->lp_ctx);
        io2.in.filename = fname;
-       io2.in.resolve_ctx = lp_resolve_context(tctx->lp_ctx);
-       io2.in.gensec_settings = lp_gensec_settings(tctx, tctx->lp_ctx);
-       lp_smbcli_options(tctx->lp_ctx, &io2.in.options);
-       lp_smbcli_session_options(tctx->lp_ctx, &io2.in.session_options);
+       io2.in.resolve_ctx = lpcfg_resolve_context(tctx->lp_ctx);
+       io2.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
+       lpcfg_smbcli_options(tctx->lp_ctx, &io2.in.options);
+       lpcfg_smbcli_session_options(tctx->lp_ctx, &io2.in.session_options);
 
        printf("Testing parallel fetchfile with %d ops\n", torture_numops);
 
@@ -346,15 +346,15 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx)
        bool ret = true;
 
        io1.in.dest_host = torture_setting_string(tctx, "host", NULL);
-       io1.in.dest_ports = lp_smb_ports(tctx->lp_ctx);
-       io1.in.socket_options = lp_socket_options(tctx->lp_ctx);
+       io1.in.dest_ports = lpcfg_smb_ports(tctx->lp_ctx);
+       io1.in.socket_options = lpcfg_socket_options(tctx->lp_ctx);
        io1.in.called_name = torture_setting_string(tctx, "host", NULL);
        io1.in.service = torture_setting_string(tctx, "share", NULL);
        io1.in.service_type = "A:";
        io1.in.credentials = cmdline_credentials;
-       io1.in.workgroup = lp_workgroup(tctx->lp_ctx);
+       io1.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
        io1.in.level = RAW_QFS_OBJECTID_INFORMATION;
-       io1.in.gensec_settings = lp_gensec_settings(tctx, tctx->lp_ctx);
+       io1.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
 
        printf("Testing parallel queryfsinfo [Object ID] with %d ops\n",
                   torture_numops);
@@ -363,7 +363,7 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx)
        c = talloc_array(tctx, struct composite_context *, torture_numops);
 
        for (i=0; i<torture_numops; i++) {
-               c[i] = smb_composite_fsinfo_send(cli->tree, &io1, lp_resolve_context(tctx->lp_ctx));
+               c[i] = smb_composite_fsinfo_send(cli->tree, &io1, lpcfg_resolve_context(tctx->lp_ctx));
                c[i]->async.fn = loadfile_complete;
                c[i]->async.private_data = count;
        }