diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-09-13 12:46:03 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:08 -0500 |
commit | 45f760973d9b5c0663608e779eb337c0648e9313 (patch) | |
tree | 8021224e493f613ec4107f531519a44059cff048 /source4/libcli/composite/connect.c | |
parent | 6bfea6335620083f3fd8b47a297c7c0140fb33c1 (diff) | |
download | samba-45f760973d9b5c0663608e779eb337c0648e9313.tar.gz samba-45f760973d9b5c0663608e779eb337c0648e9313.tar.bz2 samba-45f760973d9b5c0663608e779eb337c0648e9313.zip |
r10200: added a composite_trigger_done() call that allows a composite function
to cause an event to happen immediately. This allows metzes patch for
recognising IPs in resolve_name() to work, and also allows us to
remove some of the other code where we currently do specific checks
for is_ipaddress().
(This used to be commit 9cc000d868e1257ef6429f6f6f1f9d3c28ca330f)
Diffstat (limited to 'source4/libcli/composite/connect.c')
-rw-r--r-- | source4/libcli/composite/connect.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source4/libcli/composite/connect.c b/source4/libcli/composite/connect.c index 4d35f5c73a..a5ce5308e5 100644 --- a/source4/libcli/composite/connect.c +++ b/source4/libcli/composite/connect.c @@ -352,17 +352,9 @@ struct composite_context *smb_composite_connect_send(struct smb_composite_connec c->event_ctx = talloc_reference(c, state->sock->event.ctx); c->private = state; - /* if the destination is an IP address, then skip the name resolution part */ - if (is_ipaddress(io->in.dest_host)) { - state->stage = CONNECT_SOCKET; - state->creq = smbcli_sock_connect_send(state->sock, io->in.dest_host, - state->io->in.port, - io->in.dest_host); - } else { - state->stage = CONNECT_RESOLVE; - make_nbt_name_server(&name, io->in.dest_host); - state->creq = resolve_name_send(&name, c->event_ctx, lp_name_resolve_order()); - } + state->stage = CONNECT_RESOLVE; + make_nbt_name_server(&name, io->in.dest_host); + state->creq = resolve_name_send(&name, c->event_ctx, lp_name_resolve_order()); if (state->creq == NULL) goto failed; state->creq->async.private = c; |