Fix the build.

12 files changed, 39 insertions, 28 deletions

diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 681d37bddb..6b59b35b5d 100644
--- 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 9e9f27af6b..e2d52f6c02 100644
--- 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 46b41e51a0..86dae6bc1f 100644
--- 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 9e75301828..1615b5322a 100644
--- 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 a6bb53a759..9d6c803ad7 100644
--- 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 f466244a40..73c2044449 100644
--- 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 2c39596e35..ca1655729b 100644
--- 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 5f1514df83..f0d25017c6 100644
--- 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 193b43266c..e53b6cddac 100644
--- 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 53909f645b..2e451e1999 100644
--- 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 d7fbe4a23d..f3a6acee50 100644
--- 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 b84938cf11..5157369a78 100644
--- 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,