Fix build for make everything.

6 files changed, 20 insertions, 2 deletions

diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 6d35dc6b82..3e0ab7af78 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -358,6 +358,7 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
 				      struct event_context *ev,
 				      const char * which, const char **ports,
 				      struct smbcli_options *smb_options,
+				      const char *socket_options,
 				      struct smbcli_session_options *smb_session_options,
 				      struct smb_iconv_convenience *iconv_convenience)
 {
@@ -381,6 +382,7 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
 		path = check_arg_pathname("if");
 		handle = dd_open_path(resolve_ctx, ev, path, ports,
 				      check_arg_numeric("ibs"), options,
+				      socket_options,
 				      smb_options, smb_session_options,
 				      iconv_convenience);
 	} else if (strcmp(which, "of") == 0) {
@@ -388,6 +390,7 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
 		path = check_arg_pathname("of");
 		handle = dd_open_path(resolve_ctx, ev, path, ports,
 				      check_arg_numeric("obs"), options,
+				      socket_options,
 				      smb_options, smb_session_options,
 				      iconv_convenience);
 	} else {
@@ -443,12 +446,14 @@ static int copy_files(struct event_context *ev, struct loadparm_context *lp_ctx)
 
 	if (!(ifile = open_file(lp_resolve_context(lp_ctx), ev, "if",
 				lp_smb_ports(lp_ctx), &options,
+				lp_socket_options(lp_ctx),
 				&session_options, lp_iconv_convenience(lp_ctx)))) {
 		return(FILESYS_EXIT_CODE);
 	}
 
 	if (!(ofile = open_file(lp_resolve_context(lp_ctx), ev, "of",
 				lp_smb_ports(lp_ctx), &options,
+				lp_socket_options(lp_ctx),
 				&session_options,
 				lp_iconv_convenience(lp_ctx)))) {
 		return(FILESYS_EXIT_CODE);
diff --git a/source4/client/cifsdd.h b/source4/client/cifsdd.h
index bb851fa248..cfc37cad54 100644
--- a/source4/client/cifsdd.h
+++ b/source4/client/cifsdd.h
@@ -97,6 +97,7 @@ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
 				  const char * path,
 				  const char **ports,
 				uint64_t io_size, int options, 
+				const char *socket_options,
 				struct smbcli_options *smb_options,
 				struct smbcli_session_options *smb_session_options,
 				struct smb_iconv_convenience *iconv_convenience);
diff --git a/source4/client/cifsddio.c b/source4/client/cifsddio.c
index 3c9e0c2202..49c32a37dc 100644
--- a/source4/client/cifsddio.c
+++ b/source4/client/cifsddio.c
@@ -225,6 +225,7 @@ static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ct
 					      const char * host,
 					      const char **ports,
 					      const char * share,
+					      const char *socket_options,
 					      struct smbcli_options *options,
 					      struct smbcli_session_options *session_options,
 					      struct smb_iconv_convenience *iconv_convenience)
@@ -237,6 +238,7 @@ static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ct
 	 */
 	ret = smbcli_full_connection(NULL, &cli, host, ports, share,
 				     NULL /* devtype */,
+				     socket_options,
 				     cmdline_credentials, resolve_ctx,
 				     ev, options,
 				     session_options,
@@ -306,6 +308,7 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx
 					const char * path,
 					uint64_t io_size,
 					int options,
+					const char *socket_options,
 					struct smbcli_options *smb_options,
 					struct smbcli_session_options *smb_session_options,
 					struct smb_iconv_convenience *iconv_convenience)
@@ -329,6 +332,7 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx
 	smbh->h.io_seek = smb_seek_func;
 
 	if ((smbh->cli = init_smb_session(resolve_ctx, ev, host, ports, share,
+					  socket_options,
 					  smb_options, smb_session_options,
 					  iconv_convenience)) == NULL) {
 		return(NULL);
@@ -351,6 +355,7 @@ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
 				  const char **ports,
 				uint64_t io_size,
 				int options,
+				const char *socket_options,
 				struct smbcli_options *smb_options,
 				struct smbcli_session_options *smb_session_options,
 				struct smb_iconv_convenience *iconv_convenience)
@@ -370,7 +375,8 @@ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
 
 			return(open_cifs_handle(resolve_ctx, ev, host, ports,
 						share, remain,
-						io_size, options, smb_options,
+						io_size, options, 
+						socket_options, smb_options,
 						smb_session_options,
 						iconv_convenience));
 		}
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index eb948f64b1..9e2456d236 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -227,6 +227,7 @@ static bool connect_servers(struct event_context *ev,
 
 			if (options.smb2) {
 				status = smb2_connect(NULL, servers[i].server_name, 
+									  lp_smb_ports(lp_ctx),
 						      servers[i].share_name,
 						      lp_resolve_context(lp_ctx),
 						      servers[i].credentials,
@@ -240,6 +241,7 @@ static bool connect_servers(struct event_context *ev,
 								     servers[i].server_name, 
 								     lp_smb_ports(lp_ctx),
 								     servers[i].share_name, "A:",
+									 lp_socket_options(lp_ctx),
 								     servers[i].credentials,
 								     lp_resolve_context(lp_ctx), ev,
 								     &smb_options,
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 819fbe072b..4beef98a8f 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -164,6 +164,7 @@ static struct smbcli_state *connect_one(struct event_context *ev,
 						server, 
 						lp_smb_ports(lp_ctx),
 						share, NULL,
+						lp_socket_options(lp_ctx),
 						servers[snum], 
 						lp_resolve_context(lp_ctx),
 						ev, &options, &session_options,
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 14d597666e..fb1277a95a 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -76,6 +76,7 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx,
 					struct event_context *ev,
 					TALLOC_CTX *mem_ctx,
 					char *share, const char **ports,
+					const char *socket_options,
 					struct smbcli_options *options,
 					struct smbcli_session_options *session_options,
 					struct smb_iconv_convenience *iconv_convenience)
@@ -96,6 +97,7 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx,
 					server, 
 					ports,
 					share, NULL,
+					socket_options,
 					cmdline_credentials, resolve_ctx, ev,
 					options, session_options,
 					iconv_convenience);
@@ -368,7 +370,8 @@ static void usage(poptContext pc)
 	lp_smbcli_session_options(lp_ctx, &session_options);
 
 	cli = connect_one(lp_resolve_context(lp_ctx), ev, mem_ctx, share, 
-			  lp_smb_ports(lp_ctx), &options, &session_options,
+			  lp_smb_ports(lp_ctx), lp_socket_options(lp_ctx), 
+			  &options, &session_options,
 			  lp_iconv_convenience(lp_ctx));
 	if (!cli) {
 		DEBUG(0,("Failed to connect to %s\n", share));