summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2006-11-13 12:32:58 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2006-11-13 12:32:58 +0000
commit734e149965a807226eb5b87e9e13fda85a48b027 (patch)
treef8ec7a69059478021630741ab902725c4ccb6a27
parenta401ddaade963ef861a77bf16a1876c5c43e7f92 (diff)
Correct error in previous patch.
-rw-r--r--src/src/expand.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/src/expand.c b/src/src/expand.c
index 234a33ff5..11582529a 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/expand.c,v 1.71 2006/11/13 12:29:30 ph10 Exp $ */
+/* $Cambridge: 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 @@ while (*s != 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;
}
- 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;
}
}