diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-23 15:24:40 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-23 15:24:40 +0200 |
| commit | 7fb26774021986a08d03db968a7826ee64ea7410 (patch) | |
| tree | 272d8e4f7671b48c95c817724b41d9c27de1e282 /source4/libcli/cliconnect.c | |
| parent | fd01b27edd5a83306f4ce567e31d43641dd003b8 (diff) | |
| parent | 1186579f94d81bc633b8f20e8ad8673313c8c39b (diff) | |
| download | samba-7fb26774021986a08d03db968a7826ee64ea7410.tar.gz samba-7fb26774021986a08d03db968a7826ee64ea7410.tar.bz2 samba-7fb26774021986a08d03db968a7826ee64ea7410.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry
(This used to be commit e8d96b61db1cddc2d8dca45e6e9b53d5c31ee5d4)
Diffstat (limited to 'source4/libcli/cliconnect.c')
| -rw-r--r-- | source4/libcli/cliconnect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c index 4858a96110..c20a7fd935 100644 --- a/source4/libcli/cliconnect.c +++ b/source4/libcli/cliconnect.c @@ -33,13 +33,14 @@ */ bool smbcli_socket_connect(struct smbcli_state *cli, const char *server, const char **ports, + struct event_context *ev_ctx, struct resolve_context *resolve_ctx, struct smbcli_options *options) { struct smbcli_socket *sock; - sock = smbcli_sock_connect_byname(server, ports, NULL, resolve_ctx, - NULL); + sock = smbcli_sock_connect_byname(server, ports, NULL, + resolve_ctx, ev_ctx); if (sock == NULL) return false; |