git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a401dda
)
Correct error in previous patch.
author
Philip Hazel
<ph10@hermes.cam.ac.uk>
Mon, 13 Nov 2006 12:32:58 +0000
(12:32 +0000)
committer
Philip Hazel
<ph10@hermes.cam.ac.uk>
Mon, 13 Nov 2006 12:32:58 +0000
(12:32 +0000)
src/src/expand.c
patch
|
blob
|
history
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 234a33ff52a125bfc3f234d2df19dab433b77f54..11582529a854fc0f35679fabe22c65c0ef728293 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/expand.c,v 1.7
1 2006/11/13 12:29:30
ph10 Exp $ */
+/* $Cambridge: exim/src/src/expand.c,v 1.7
2 2006/11/13 12:32:58
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-3930,15
+3930,15
@@
while (*s != 0)
alarm(timeout);
rc = connect(fd, (struct sockaddr *)(&sockun), sizeof(sockun));
alarm(0);
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;
}
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;
}
}
goto SOCK_FAIL;
}
}