diff options
| -rw-r--r-- | source4/libcli/smb2/connect.c | 11 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/smb2/vfs_smb2.c | 4 | ||||
| -rw-r--r-- | source4/torture/gentest.c | 4 | ||||
| -rw-r--r-- | source4/torture/smb2/scan.c | 4 | ||||
| -rw-r--r-- | source4/torture/smb2/util.c | 4 |
6 files changed, 22 insertions, 9 deletions
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index d5fff4a305..61ee994484 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -235,7 +235,8 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx, struct resolve_context *resolve_ctx, struct cli_credentials *credentials, struct event_context *ev, - struct smbcli_options *options) + struct smbcli_options *options, + const char *socket_options) { struct composite_context *c; struct smb2_connect_state *state; @@ -258,7 +259,7 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx, state->share = talloc_strdup(c, share); if (composite_nomem(state->share, c)) return c; state->resolve_ctx = talloc_reference(state, resolve_ctx); - state->socket_options = lp_socket_options(global_loadparm); + state->socket_options = talloc_reference(state, socket_options); if (composite_nomem(state->socket_options, c)) return c; ZERO_STRUCT(name); @@ -296,10 +297,12 @@ NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx, struct cli_credentials *credentials, struct smb2_tree **tree, struct event_context *ev, - struct smbcli_options *options) + struct smbcli_options *options, + const char *socket_options) { struct composite_context *c = smb2_connect_send(mem_ctx, host, ports, share, resolve_ctx, - credentials, ev, options); + credentials, ev, options, + socket_options); return smb2_connect_recv(c, mem_ctx, tree); } diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 7bdd89649e..0ec17295cb 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -253,7 +253,9 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send( s->io.resolve_ctx, s->io.creds, c->event_ctx, - &options); + &options, + lp_socket_options(lp_ctx) + ); composite_continue(c, conn_req, continue_smb2_connect, c); return c; } diff --git a/source4/ntvfs/smb2/vfs_smb2.c b/source4/ntvfs/smb2/vfs_smb2.c index 7e8356e94e..8e3219293d 100644 --- a/source4/ntvfs/smb2/vfs_smb2.c +++ b/source4/ntvfs/smb2/vfs_smb2.c @@ -231,7 +231,9 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs, remote_share, lp_resolve_context(ntvfs->ctx->lp_ctx), credentials, - ntvfs->ctx->event_ctx, &options); + ntvfs->ctx->event_ctx, &options, + lp_socket_options(ntvfs->ctx->lp_ctx) + ); status = smb2_connect_recv(creq, private, &tree); NT_STATUS_NOT_OK_RETURN(status); diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index aefed23f51..eb948f64b1 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -231,7 +231,9 @@ static bool connect_servers(struct event_context *ev, lp_resolve_context(lp_ctx), servers[i].credentials, &servers[i].smb2_tree[j], - ev, &smb_options); + ev, &smb_options, + lp_socket_options(lp_ctx) + ); } else { status = smbcli_tree_full_connection(NULL, &servers[i].smb_tree[j], diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index ae51af1882..5f1514df83 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -224,7 +224,9 @@ bool torture_smb2_scan(struct torture_context *torture) status = smb2_connect(mem_ctx, host, share, lp_resolve_context(torture->lp_ctx), credentials, &tree, - torture->ev, &options); + 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 3a437acbab..193b43266c 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -277,7 +277,9 @@ bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tr status = smb2_connect(tctx, host, share, lp_resolve_context(tctx->lp_ctx), credentials, tree, - tctx->ev, &options); + tctx->ev, &options, + lp_socket_options(tctx->lp_ctx) + ); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect to SMB2 share \\\\%s\\%s - %s\n", host, share, nt_errstr(status)); |