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

[mdw/samba-autobuild/.git] / source4 / torture / locktest2.c

diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c
index 2cf28c3554cac9de2aa2194cfd25769318ab30f1..7364d6df2ff34075919f332d76a1d5e2c6e3b1f6 100644 (file)
--- a/source4/torture/locktest2.c
+++ b/source4/torture/locktest2.c
@@ -173,7 +173,7 @@ static struct smbcli_state *connect_one(TALLOC_CTX *mem_ctx,
 
        nt_status = smbcli_full_connection(NULL, 
                           &c, myname, server_n, ports, share, NULL,
-                          username, lp_workgroup(), password, ev,
+                          username, lpcfg_workgroup(), password, ev,
                           options, session_options, gensec_settings);
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("smbcli_full_connection failed with error %s\n", nt_errstr(nt_status)));
@@ -513,7 +513,7 @@ static void usage(void)
        argv += 4;
 
        lp_ctx = loadparm_init(mem_ctx);
-       lp_load(lp_ctx, dyn_CONFIGFILE);
+       lpcfg_load(lp_ctx, dyn_CONFIGFILE);
 
        if (getenv("USER")) {
                username = talloc_strdup(mem_ctx, getenv("USER"));
@@ -568,11 +568,11 @@ static void usage(void)
        ev = s4_event_context_init(mem_ctx);
 
        locking_init(1);
-       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);
        test_locks(mem_ctx, share1, share2, nfspath1, nfspath2, 
-                          lp_smb_ports(lp_ctx),
-                          &options, &session_options, lp_gensec_settings(lp_ctx), ev);
+                          lpcfg_smb_ports(lp_ctx),
+                          &options, &session_options, lpcfg_gensec_settings(lp_ctx), ev);
 
        return(0);
 }