summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-12-13 05:54:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:27 -0500
commit050534827f7dcbc9cd78683e477aaa6dd2ba9394 (patch)
tree13c2f7ebd89e7122b4a2ca66f0ef505864b0a8a5
parent6b232e8c1f60186c8a34f3f5b899eed80916f0e8 (diff)
downloadsamba-050534827f7dcbc9cd78683e477aaa6dd2ba9394.tar.gz
samba-050534827f7dcbc9cd78683e477aaa6dd2ba9394.tar.bz2
samba-050534827f7dcbc9cd78683e477aaa6dd2ba9394.zip
r20148: Forgot to merge. Ensure open_any_socket_out()
is safe from signals. Jeremy. (This used to be commit c264a0aa4a83a3d47db33446b16a8766bc14824f)
-rw-r--r--source3/lib/util_sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 1a73a310b6..2866a443d4 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -974,7 +974,7 @@ BOOL open_any_socket_out(struct sockaddr_in *addrs, int num_addrs,
}
if (errno == EINPROGRESS || errno == EALREADY ||
- errno == EAGAIN) {
+ errno == EAGAIN || errno == EINTR) {
/* These are the error messages that something is
progressing. */
good_connect = True;