summaryrefslogtreecommitdiffstats
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
commitc264a0aa4a83a3d47db33446b16a8766bc14824f (patch)
tree35016b523c3f64f3ec0339f791078c207e6c2793
parent5d364bc5ccc45b8d7bf3e484d16b37ac9e06b5cf (diff)
downloadsamba-c264a0aa4a83a3d47db33446b16a8766bc14824f.tar.gz
samba-c264a0aa4a83a3d47db33446b16a8766bc14824f.tar.xz
samba-c264a0aa4a83a3d47db33446b16a8766bc14824f.zip
r20148: Forgot to merge. Ensure open_any_socket_out()
is safe from signals. Jeremy.
-rw-r--r--source/lib/util_sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 1a73a310b62..2866a443d47 100644
--- a/source/lib/util_sock.c
+++ b/source/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;