Fix the build.

diff --git a/source4/client/client.c b/source4/client/client.c
index 8936a3cf2ff5cf6537e8ddf725ada58ac541ee6d..5066df1f544b92b1cca466bb31a129bfe335389d 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3045,6 +3045,7 @@ static bool do_connect(struct smbclient_context *ctx,
                       struct resolve_context *resolve_ctx,
                       const char *specified_server, const char **ports, 
                       const char *specified_share, 
+                          const char *socket_options,
                       struct cli_credentials *cred, 
                       struct smbcli_options *options,
                       struct smbcli_session_options *session_options,
@@ -3066,7 +3067,9 @@ static bool do_connect(struct smbclient_context *ctx,
        ctx->remote_cur_dir = talloc_strdup(ctx, "\\");
        
        status = smbcli_full_connection(ctx, &ctx->cli, server, ports,
-                                       share, NULL, cred, resolve_ctx, 
+                                       share, NULL, 
+                                       socket_options,
+                                       cred, resolve_ctx, 
                                        ev_ctx, options, session_options,
                                        iconv_convenience);
        if (!NT_STATUS_IS_OK(status)) {
@@ -3279,6 +3282,7 @@ static int do_message_op(const char *netbios_name, const char *desthost,
        
        if (!do_connect(ctx, ev_ctx, lp_resolve_context(cmdline_lp_ctx),
                        desthost, lp_smb_ports(cmdline_lp_ctx), service,
+                       lp_socket_options(cmdline_lp_ctx),
                        cmdline_credentials, &smb_options, &smb_session_options,
                        lp_iconv_convenience(cmdline_lp_ctx)))
                return 1;

diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 681d37bddb8c6536737b2db430bee5626b9039db..6b59b35b5d8b07e4f0e8b0a4f48dd7333c6dc667 100644 (file)
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -341,7 +341,6 @@ bool torture_bench_lock(struct torture_context *torture)
                }
                talloc_steal(mem_ctx, state);
                state[i].tree = cli->tree;
-               state[i].socket_options = lp_socket_options(torture->lp_ctx);
                state[i].dest_host = talloc_strdup(state[i].mem_ctx, 
                                                   cli->tree->session->transport->socket->hostname);
                state[i].dest_ports = talloc_array(state[i].mem_ctx, 

diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index 9e9f27af6bfbf3646cc6eea5c11307d45c99ec35..e2d52f6c029f8a3fa90f7a9f2f56efa88d079fd9 100644 (file)
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -401,7 +401,6 @@ bool torture_bench_open(struct torture_context *torture)
                state[i].dest_ports[0] = talloc_asprintf(state[i].dest_ports, 
                                                         "%u", state[i].cli->tree->session->transport->socket->port);
                state[i].dest_ports[1] = NULL;
-               state[i].socket_options = lp_socket_options(torture->lp_ctx);
                state[i].called_name  = talloc_strdup(state[i].mem_ctx,
                                                      state[i].cli->tree->session->transport->called.name);
                state[i].service_type = talloc_strdup(state[i].mem_ctx,

diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 46b41e51a00ad9c0ed139be5b6afe607f36e5f40..86dae6bc1fd6f8a7618bb1a4656ee0dd2a6fce1d 100644 (file)
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -187,7 +187,7 @@ static bool open_connection_no_level2_oplocks(struct torture_context *tctx,
                                        torture_setting_string(tctx, "host", NULL),
                                        lp_smb_ports(tctx->lp_ctx),
                                        torture_setting_string(tctx, "share", NULL),
-                                       NULL, cmdline_credentials,
+                                       NULL, lp_socket_options(tctx->lp_ctx), cmdline_credentials,
                                        lp_resolve_context(tctx->lp_ctx),
                                        tctx->ev, &options, &session_options,
                                        lp_iconv_convenience(tctx->lp_ctx));

diff --git a/source4/torture/raw/tconrate.c b/source4/torture/raw/tconrate.c
index 9e753018289c55e4d4408e18144010cf3e93b67a..1615b5322a5f9e72cb246ca735421547169f71f6 100644 (file)
--- a/source4/torture/raw/tconrate.c
+++ b/source4/torture/raw/tconrate.c
@@ -100,7 +100,7 @@ static int fork_tcon_client(struct torture_context *tctx,
 
                status = smbcli_full_connection(NULL, &cli,
                                host, lp_smb_ports(tctx->lp_ctx), share,
-                               NULL, cmdline_credentials,
+                               NULL, lp_socket_options(tctx->lp_ctx), cmdline_credentials,
                                lp_resolve_context(tctx->lp_ctx),
                                tctx->ev, &options, &session_options,
                                lp_iconv_convenience(tctx->lp_ctx));

diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c
index a6bb53a7599a2fa69c40d7c60a528a85816495fa..9d6c803ad7163043502bce0c90f099327fbe86b0 100644 (file)
--- a/source4/torture/rpc/join.c
+++ b/source4/torture/rpc/join.c
@@ -39,6 +39,7 @@ bool torture_rpc_join(struct torture_context *torture)
        status = smbcli_full_connection(tj, &cli, host,
                                        lp_smb_ports(torture->lp_ctx),
                                        "IPC$", NULL,
+                                       lp_socket_options(torture->lp_ctx),
                                        machine_account,
                                        lp_resolve_context(torture->lp_ctx),
                                        torture->ev, &options, &session_options,
@@ -66,6 +67,7 @@ bool torture_rpc_join(struct torture_context *torture)
        status = smbcli_full_connection(tj, &cli, host,
                                        lp_smb_ports(torture->lp_ctx),
                                        "IPC$", NULL,
+                                       lp_socket_options(torture->lp_ctx),
                                        machine_account,
                                        lp_resolve_context(torture->lp_ctx),
                                        torture->ev, &options, &session_options,

diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index f466244a4087affca24b7ee8a909629d2435e6b9..73c2044449efd045f033815d8f6c99f697d4cd6d 100644 (file)
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -89,7 +89,9 @@ bool torture_bind_authcontext(struct torture_context *torture)
        status = smbcli_full_connection(mem_ctx, &cli,
                                        torture_setting_string(torture, "host", NULL),
                                        lp_smb_ports(torture->lp_ctx),
-                                       "IPC$", NULL, cmdline_credentials,
+                                       "IPC$", NULL, 
+                                       lp_socket_options(torture->lp_ctx),
+                                       cmdline_credentials,
                                        lp_resolve_context(torture->lp_ctx),
                                        torture->ev, &options, &session_options,
                                        lp_iconv_convenience(torture->lp_ctx));
@@ -309,7 +311,9 @@ bool torture_bind_samba3(struct torture_context *torture)
        status = smbcli_full_connection(mem_ctx, &cli,
                                        torture_setting_string(torture, "host", NULL),
                                        lp_smb_ports(torture->lp_ctx),
-                                       "IPC$", NULL, cmdline_credentials,
+                                       "IPC$", NULL, 
+                                       lp_socket_options(torture->lp_ctx),
+                                       cmdline_credentials,
                                        lp_resolve_context(torture->lp_ctx),
                                        torture->ev, &options, &session_options,
                                        lp_iconv_convenience(torture->lp_ctx));
@@ -1245,7 +1249,9 @@ bool torture_netlogon_samba3(struct torture_context *torture)
        status = smbcli_full_connection(mem_ctx, &cli,
                                        torture_setting_string(torture, "host", NULL),
                                        lp_smb_ports(torture->lp_ctx),
-                                       "IPC$", NULL, anon_creds, 
+                                       "IPC$", NULL, 
+                                       lp_socket_options(torture->lp_ctx),
+                                       anon_creds, 
                                        lp_resolve_context(torture->lp_ctx),
                                        torture->ev, &options, &session_options,
                                        lp_iconv_convenience(torture->lp_ctx));
@@ -1335,8 +1341,8 @@ static bool test_join3(struct torture_context *tctx,
        status = smbcli_full_connection(tctx, &cli,
                                        torture_setting_string(tctx, "host", NULL),
                                        lp_smb_ports(tctx->lp_ctx),
-                                       "IPC$", NULL, smb_creds, 
-                                       lp_resolve_context(tctx->lp_ctx),
+                                       "IPC$", NULL, lp_socket_options(tctx->lp_ctx),
+                                       smb_creds, lp_resolve_context(tctx->lp_ctx),
                                        tctx->ev, &options, &session_options,
                                        lp_iconv_convenience(tctx->lp_ctx));
        if (!NT_STATUS_IS_OK(status)) {
@@ -1718,7 +1724,7 @@ bool torture_samba3_rpc_getusername(struct torture_context *torture)
        status = smbcli_full_connection(
                mem_ctx, &cli, torture_setting_string(torture, "host", NULL),
                lp_smb_ports(torture->lp_ctx),
-               "IPC$", NULL, cmdline_credentials, 
+               "IPC$", NULL, lp_socket_options(torture->lp_ctx), cmdline_credentials, 
                lp_resolve_context(torture->lp_ctx),
                torture->ev, &options, &session_options,
                lp_iconv_convenience(torture->lp_ctx));
@@ -1745,8 +1751,8 @@ bool torture_samba3_rpc_getusername(struct torture_context *torture)
 
        status = smbcli_full_connection(
                mem_ctx, &cli, torture_setting_string(torture, "host", NULL),
-               lp_smb_ports(torture->lp_ctx),
-               "IPC$", NULL, anon_creds, 
+               lp_smb_ports(torture->lp_ctx), "IPC$", NULL, 
+               lp_socket_options(torture->lp_ctx), anon_creds, 
                lp_resolve_context(torture->lp_ctx),
                torture->ev, &options, &session_options,
                lp_iconv_convenience(torture->lp_ctx));

diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 2c39596e356db283f191872e5797e5c3dae5f682..ca1655729bd017d4e8f1b5fd56eabe9695ee5e83 100644 (file)
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -292,7 +292,7 @@ static bool test_schannel(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx, status, "seconday connection");
 
        status = dcerpc_bind_auth(p_netlogon, &ndr_table_netlogon, 
-                                 credentials, tctx->lp_ctx,
+                                 credentials, lp_gensec_settings(tctx, tctx->lp_ctx),
                                  DCERPC_AUTH_TYPE_SCHANNEL,
                                  dcerpc_auth_level(p->conn),
                                  NULL);
@@ -319,7 +319,7 @@ static bool test_schannel(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx, status, "seconday connection");
 
        status = dcerpc_bind_auth(p_lsa, &ndr_table_lsarpc,
-                                 credentials, tctx->lp_ctx,
+                                 credentials, lp_gensec_settings(tctx, tctx->lp_ctx),
                                  DCERPC_AUTH_TYPE_SCHANNEL,
                                  dcerpc_auth_level(p->conn),
                                  NULL);
@@ -360,7 +360,7 @@ static bool test_schannel(struct torture_context *tctx,
 
        /* and now setup an SCHANNEL bind on netlogon */
        status = dcerpc_bind_auth(p_netlogon2, &ndr_table_netlogon,
-                                 credentials, tctx->lp_ctx,
+                                 credentials, lp_gensec_settings(tctx, tctx->lp_ctx),
                                  DCERPC_AUTH_TYPE_SCHANNEL,
                                  dcerpc_auth_level(p_samr2->conn),
                                  NULL);

diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c
index 5f1514df83c58865b01b3304da28bdc8cf6559af..f0d25017c6d33c0eb87572215e8c674f8e56bedc 100644 (file)
--- a/source4/torture/smb2/scan.c
+++ b/source4/torture/smb2/scan.c
@@ -204,10 +204,12 @@ bool torture_smb2_scan(struct torture_context *torture)
 
        lp_smbcli_options(torture->lp_ctx, &options);
 
-       status = smb2_connect(mem_ctx, host, share, 
-                             lp_resolve_context(torture->lp_ctx), 
-                             credentials, &tree, 
-                             torture->ev, &options);
+       status = smb2_connect(mem_ctx, host, 
+                                                 lp_smb_ports(torture->lp_ctx),
+                                                 share, 
+                                                 lp_resolve_context(torture->lp_ctx), 
+                                                 credentials, &tree, torture->ev, &options,
+                                                 lp_socket_options(torture->lp_ctx));
        if (!NT_STATUS_IS_OK(status)) {
                printf("Connection failed - %s\n", nt_errstr(status));
                return false;
@@ -221,12 +223,12 @@ bool torture_smb2_scan(struct torture_context *torture)
                smb2_transport_send(req);
                if (!smb2_request_receive(req)) {
                        talloc_free(tree);
-                       status = smb2_connect(mem_ctx, host, share, 
-                                             lp_resolve_context(torture->lp_ctx), 
-                                             credentials, &tree, 
-                                             torture->ev, &options,
-                                                 lp_socket_options(torture->lp_ctx)
-                                                 );
+                       status = smb2_connect(mem_ctx, host, 
+                                                                 lp_smb_ports(torture->lp_ctx),
+                                                                 share, 
+                                                                 lp_resolve_context(torture->lp_ctx), 
+                                                                 credentials, &tree, torture->ev, &options,
+                                                                 lp_socket_options(torture->lp_ctx));
                        if (!NT_STATUS_IS_OK(status)) {
                                printf("Connection failed - %s\n", nt_errstr(status));
                                return false;

diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 193b43266c5b029402e113c5203517341e6413d3..e53b6cddacf384532ba7380bc693ac5560b62e81 100644 (file)
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -274,7 +274,9 @@ bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tr
 
        lp_smbcli_options(tctx->lp_ctx, &options);
 
-       status = smb2_connect(tctx, host, share, 
+       status = smb2_connect(tctx, host, 
+                                                 lp_smb_ports(tctx->lp_ctx),
+                                                 share, 
                              lp_resolve_context(tctx->lp_ctx),
                              credentials, tree, 
                              tctx->ev, &options,

diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c
index 53909f645b651617d0579e7e2f15791a497cc3ac..2e451e199907d481b87c7577d18ebdd04e23063a 100644 (file)
--- a/source4/torture/unix/unix_info2.c
+++ b/source4/torture/unix/unix_info2.c
@@ -63,7 +63,7 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx)
 
        status = smbcli_full_connection(tctx, &cli, host, 
                                        lp_smb_ports(tctx->lp_ctx),
-                                       share, NULL,
+                                       share, NULL, lp_socket_options(tctx->lp_ctx),
                                        cmdline_credentials, 
                                        lp_resolve_context(tctx->lp_ctx),
                                        tctx->ev, &options, &session_options,

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index d7fbe4a23d814bb0e245fdf08dbe5de2875640bb..f3a6acee506888fad8c237ff1e674fb06a416d6d 100644 (file)
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -84,7 +84,7 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx,
 
        status = smbcli_full_connection(tctx, &cli, host, 
                                        lp_smb_ports(tctx->lp_ctx),
-                                       share, NULL,
+                                       share, NULL, lp_socket_options(tctx->lp_ctx),
                                        creds, lp_resolve_context(tctx->lp_ctx),
                                        tctx->ev, &options, &session_options,
                                        lp_iconv_convenience(tctx->lp_ctx));

diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index b84938cf11f3d755dc02a2c8885b1c165aee0ad2..5157369a78e2c536ef2dbe45596af3ff272da0ea 100644 (file)
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -486,6 +486,7 @@ _PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx,
        status = smbcli_full_connection(mem_ctx, c, hostname, 
                                        lp_smb_ports(tctx->lp_ctx),
                                        sharename, NULL,
+                                       lp_socket_options(tctx->lp_ctx),
                                        cmdline_credentials, 
                                        lp_resolve_context(tctx->lp_ctx),
                                        ev, &options, &session_options,