summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2004-07-21 20:19:20 +0000
committerStef Walter <stef@memberwebs.com>2004-07-21 20:19:20 +0000
commit62824776c7693d116dbe5914ca6f1cb11d18262d (patch)
tree603a0b99f1f0cfdf53ff890598f62d526b9402a9
parentf8f3669040043a6a681fe9711cf83204f6046c2f (diff)
- Timeout gives a proper error message
-rw-r--r--ChangeLog1
-rw-r--r--common/smtppass.c2
-rw-r--r--src/clamsmtpd.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ade187..8a1254c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
0.4
- Option for quarantining files with viruses
- Fixed problem with returning wrong SMTP error code
+ - Timeout gives a proper error message
0.3
- Small log format changes
diff --git a/common/smtppass.c b/common/smtppass.c
index b66366c..5cc9c7f 100644
--- a/common/smtppass.c
+++ b/common/smtppass.c
@@ -626,7 +626,7 @@ static int smtp_passthru(clamsmtp_context_t* ctx)
switch(select(FD_SETSIZE, &mask, NULL, NULL, &g_timeout))
{
case 0:
- message(ctx, LOG_ERR, "network operation timed out");
+ messagex(ctx, LOG_ERR, "network operation timed out");
RETURN(-1);
case -1:
message(ctx, LOG_ERR, "couldn't select on sockets");
diff --git a/src/clamsmtpd.c b/src/clamsmtpd.c
index b66366c..5cc9c7f 100644
--- a/src/clamsmtpd.c
+++ b/src/clamsmtpd.c
@@ -626,7 +626,7 @@ static int smtp_passthru(clamsmtp_context_t* ctx)
switch(select(FD_SETSIZE, &mask, NULL, NULL, &g_timeout))
{
case 0:
- message(ctx, LOG_ERR, "network operation timed out");
+ messagex(ctx, LOG_ERR, "network operation timed out");
RETURN(-1);
case -1:
message(ctx, LOG_ERR, "couldn't select on sockets");