diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 01:03:26 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 01:03:26 +0100 |
| commit | 7a6190e9a7cc176ebd428c1e3edde1328ebca3e3 (patch) | |
| tree | 3c4ef46b2d735dafc6c4add9d99270f6d5341dd8 /source4/libcli/smb_composite | |
| parent | cb7d085ec34442db25e6c5a5d4b4547e0718fb92 (diff) | |
| download | samba-7a6190e9a7cc176ebd428c1e3edde1328ebca3e3.tar.gz samba-7a6190e9a7cc176ebd428c1e3edde1328ebca3e3.tar.bz2 samba-7a6190e9a7cc176ebd428c1e3edde1328ebca3e3.zip | |
Remove another use of global_loadparm.
Diffstat (limited to 'source4/libcli/smb_composite')
| -rw-r--r-- | source4/libcli/smb_composite/connect.c | 2 | ||||
| -rw-r--r-- | source4/libcli/smb_composite/fetchfile.c | 1 | ||||
| -rw-r--r-- | source4/libcli/smb_composite/fsinfo.c | 1 | ||||
| -rw-r--r-- | source4/libcli/smb_composite/smb_composite.h | 3 |
4 files changed, 6 insertions, 1 deletions
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c index 4a73acfd57..7508035f48 100644 --- a/source4/libcli/smb_composite/connect.c +++ b/source4/libcli/smb_composite/connect.c @@ -377,7 +377,7 @@ static NTSTATUS connect_resolve(struct composite_context *c, io->in.dest_ports, io->in.dest_host, NULL, c->event_ctx, - lp_socket_options(global_loadparm)); + io->in.socket_options); NT_STATUS_HAVE_NO_MEMORY(state->creq); state->stage = CONNECT_SOCKET; diff --git a/source4/libcli/smb_composite/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c index cbe2289a55..6dc2ae8c8f 100644 --- a/source4/libcli/smb_composite/fetchfile.c +++ b/source4/libcli/smb_composite/fetchfile.c @@ -138,6 +138,7 @@ struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetc state->connect->in.dest_host = io->in.dest_host; state->connect->in.dest_ports = io->in.ports; + state->connect->in.socket_options = io->in.socket_options; state->connect->in.called_name = io->in.called_name; state->connect->in.service = io->in.service; state->connect->in.service_type = io->in.service_type; diff --git a/source4/libcli/smb_composite/fsinfo.c b/source4/libcli/smb_composite/fsinfo.c index f148fb8bf6..8f5339fa05 100644 --- a/source4/libcli/smb_composite/fsinfo.c +++ b/source4/libcli/smb_composite/fsinfo.c @@ -146,6 +146,7 @@ struct composite_context *smb_composite_fsinfo_send(struct smbcli_tree *tree, state->connect->in.dest_host = io->in.dest_host; state->connect->in.dest_ports = io->in.dest_ports; + state->connect->in.socket_options = io->in.socket_options; state->connect->in.called_name = io->in.called_name; state->connect->in.service = io->in.service; state->connect->in.service_type = io->in.service_type; diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h index fd1b95e64f..2b1e368daa 100644 --- a/source4/libcli/smb_composite/smb_composite.h +++ b/source4/libcli/smb_composite/smb_composite.h @@ -53,6 +53,7 @@ struct smb_composite_fetchfile { const char *called_name; const char *service; const char *service_type; + const char *socket_options; struct cli_credentials *credentials; const char *workgroup; const char *filename; @@ -93,6 +94,7 @@ struct smb_composite_connect { struct { const char *dest_host; const char **dest_ports; + const char *socket_options; const char *called_name; const char *service; const char *service_type; @@ -133,6 +135,7 @@ struct smb_composite_fsinfo { struct { const char *dest_host; const char **dest_ports; + const char *socket_options; const char *called_name; const char *service; const char *service_type; |