svn commit: samba r22181 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_25/source/lib

[jra at samba.org]

Author: jra
Date: 2007-04-12 01:09:19 +0000 (Thu, 12 Apr 2007)
New Revision: 22181

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22181

Log:
Fix for EISCON in open_any_socket_out from William Jojo
for bug #3632.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/lib/util_sock.c
   branches/SAMBA_3_0_25/source/lib/util_sock.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_sock.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util_sock.c	2007-04-12 00:34:59 UTC (rev 22180)
+++ branches/SAMBA_3_0/source/lib/util_sock.c	2007-04-12 01:09:19 UTC (rev 22181)
@@ -999,6 +999,9 @@
 		}
 
 		if (errno == EINPROGRESS || errno == EALREADY ||
+#ifdef EISCONN
+			errno == EISCONN ||
+#endif
 		    errno == EAGAIN || errno == EINTR) {
 			/* These are the error messages that something is
 			   progressing. */

Modified: branches/SAMBA_3_0_25/source/lib/util_sock.c
===================================================================
--- branches/SAMBA_3_0_25/source/lib/util_sock.c	2007-04-12 00:34:59 UTC (rev 22180)
+++ branches/SAMBA_3_0_25/source/lib/util_sock.c	2007-04-12 01:09:19 UTC (rev 22181)
@@ -974,6 +974,9 @@
 		}
 
 		if (errno == EINPROGRESS || errno == EALREADY ||
+#ifdef EISCONN
+			errno == EISCONN ||
+#endif
 		    errno == EAGAIN || errno == EINTR) {
 			/* These are the error messages that something is
 			   progressing. */