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

[kamenim/samba.git] / source4 / torture / smb2 / scan.c

diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c
index a5e682c11145bb80417ce55af127e719836fd653..3b132ab8a4f655c22af1f50a24e842d880f12b27 100644 (file)
--- a/source4/torture/smb2/scan.c
+++ b/source4/torture/smb2/scan.c
@@ -23,7 +23,6 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/events/events.h"
 #include "torture/torture.h"
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
@@ -202,15 +201,15 @@ bool torture_smb2_scan(struct torture_context *torture)
        struct smb2_request *req;
        struct smbcli_options options;
 
-       lp_smbcli_options(torture->lp_ctx, &options);
+       lpcfg_smbcli_options(torture->lp_ctx, &options);
 
        status = smb2_connect(mem_ctx, host, 
-                                                 lp_smb_ports(torture->lp_ctx),
+                                                 lpcfg_smb_ports(torture->lp_ctx),
                                                  share, 
-                                                 lp_resolve_context(torture->lp_ctx), 
+                                                 lpcfg_resolve_context(torture->lp_ctx),
                                                  credentials, &tree, torture->ev, &options,
-                                                 lp_socket_options(torture->lp_ctx),
-                                                 lp_gensec_settings(torture, torture->lp_ctx));
+                                                 lpcfg_socket_options(torture->lp_ctx),
+                                                 lpcfg_gensec_settings(torture, torture->lp_ctx));
        if (!NT_STATUS_IS_OK(status)) {
                printf("Connection failed - %s\n", nt_errstr(status));
                return false;
@@ -225,12 +224,12 @@ bool torture_smb2_scan(struct torture_context *torture)
                if (!smb2_request_receive(req)) {
                        talloc_free(tree);
                        status = smb2_connect(mem_ctx, host, 
-                                                                 lp_smb_ports(torture->lp_ctx),
+                                                                 lpcfg_smb_ports(torture->lp_ctx),
                                                                  share, 
-                                                                 lp_resolve_context(torture->lp_ctx), 
+                                                                 lpcfg_resolve_context(torture->lp_ctx),
                                                                  credentials, &tree, torture->ev, &options,
-                                                                 lp_socket_options(torture->lp_ctx),
-                                                                 lp_gensec_settings(mem_ctx, torture->lp_ctx));
+                                                                 lpcfg_socket_options(torture->lp_ctx),
+                                                                 lpcfg_gensec_settings(mem_ctx, torture->lp_ctx));
                        if (!NT_STATUS_IS_OK(status)) {
                                printf("Connection failed - %s\n", nt_errstr(status));
                                return false;