ph10 2006/11/13 12:32:58 GMT
Modified files:
exim-src/src expand.c
Log:
Correct error in previous patch.
Revision Changes Path
1.72 +5 -5 exim/exim-src/src/expand.c
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- expand.c 13 Nov 2006 12:29:30 -0000 1.71
+++ expand.c 13 Nov 2006 12:32:58 -0000 1.72
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.71 2006/11/13 12:29:30 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.72 2006/11/13 12:32:58 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3930,15 +3930,15 @@
alarm(timeout);
rc = connect(fd, (struct sockaddr *)(&sockun), sizeof(sockun));
alarm(0);
- if (rc < 0)
+ if (sigalrm_seen)
{
- expand_string_message = string_sprintf("failed to connect to socket "
- "%s: %s", sub_arg[0], strerror(errno));
+ expand_string_message = US "socket connect timed out";
goto SOCK_FAIL;
}
- if (sigalrm_seen)
+ if (rc < 0)
{
- expand_string_message = US "socket connect timed out";
+ expand_string_message = string_sprintf("failed to connect to socket "
+ "%s: %s", sub_arg[0], strerror(errno));
goto SOCK_FAIL;
}
}
