summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-17 00:10:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:18 -0500
commit11bc3f3589007cfc3dcce1a37d824a8c83b01d1a (patch)
tree0f205e9b2b1267d01f25dcb70b283cb54b8e900f
parent5c332f6e9d27c6cdaa885a52312d90ac3835c90b (diff)
downloadsamba-11bc3f3589007cfc3dcce1a37d824a8c83b01d1a.tar.gz
samba-11bc3f3589007cfc3dcce1a37d824a8c83b01d1a.tar.bz2
samba-11bc3f3589007cfc3dcce1a37d824a8c83b01d1a.zip
r7660: improved error handling in socket_connect_ev() (it matters when name
resolution fails) (This used to be commit 4013c2ddea0cd03f875e2acf40d2a34344017d05)
-rw-r--r--source4/lib/socket/connect.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index f3f9134f26..e7f2a11daf 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -56,6 +56,9 @@ NTSTATUS socket_connect_ev(struct socket_context *sock,
status = socket_connect(sock, my_address, my_port,
server_address, server_port, flags);
+ if (NT_STATUS_IS_ERR(status)) {
+ return status;
+ }
event_add_fd(ev, tmp_ctx, socket_get_fd(sock), EVENT_FD_WRITE,
socket_connect_handler, &status);