diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-11-23 21:53:36 +0300 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-11-23 21:53:36 +0300 |
| commit | e2b08413781f55098787f319a2edafb5980f1cb6 (patch) | |
| tree | 561b34f2fe9fb9111b79fa06481e9b06b9722b1b /src/smtp.c | |
| parent | 3ebceeece2204d3755df1f1cc8210f7e97b6daad (diff) | |
| download | rspamd-e2b08413781f55098787f319a2edafb5980f1cb6.tar.gz rspamd-e2b08413781f55098787f319a2edafb5980f1cb6.zip | |
Fix XCLIENT hostnames when hostname cannot be resolved.
Diffstat (limited to 'src/smtp.c')
| -rw-r--r-- | src/smtp.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/smtp.c b/src/smtp.c index 859a83917..a76858547 100644 --- a/src/smtp.c +++ b/src/smtp.c @@ -44,6 +44,9 @@ #define DEFAULT_REJECT_MESSAGE "450 4.5.0 Spam message rejected" +#define XCLIENT_HOST_UNAVAILABLE "[UNAVAILABLE]" +#define XCLIENT_HOST_TEMPFAIL "[TEMPUNAVAIL]" + static gboolean smtp_write_socket (void *arg); static sig_atomic_t wanna_die = 0; @@ -574,10 +577,10 @@ smtp_dns_cb (struct rspamd_dns_reply *reply, void *arg) "DNS error: %s", dns_strerror (reply->code)); if (reply->code == DNS_RC_NXDOMAIN) { - session->hostname = memory_pool_strdup (session->pool, "unknown"); + session->hostname = memory_pool_strdup (session->pool, XCLIENT_HOST_UNAVAILABLE); } else { - session->hostname = memory_pool_strdup (session->pool, "tempfail"); + session->hostname = memory_pool_strdup (session->pool, XCLIENT_HOST_TEMPFAIL); } session->state = SMTP_STATE_DELAY; smtp_make_delay (session); @@ -598,10 +601,10 @@ smtp_dns_cb (struct rspamd_dns_reply *reply, void *arg) "DNS error: %s", dns_strerror (reply->code)); if (reply->code == DNS_RC_NXDOMAIN) { - session->hostname = memory_pool_strdup (session->pool, "unknown"); + session->hostname = memory_pool_strdup (session->pool, XCLIENT_HOST_UNAVAILABLE); } else { - session->hostname = memory_pool_strdup (session->pool, "tempfail"); + session->hostname = memory_pool_strdup (session->pool, XCLIENT_HOST_TEMPFAIL); } session->state = SMTP_STATE_DELAY; smtp_make_delay (session); @@ -621,7 +624,7 @@ smtp_dns_cb (struct rspamd_dns_reply *reply, void *arg) if (res == 0) { msg_info ("cannot find address for hostname: %s, ip: %s", session->hostname, inet_ntoa (session->client_addr)); - session->hostname = memory_pool_strdup (session->pool, "unknown"); + session->hostname = memory_pool_strdup (session->pool, XCLIENT_HOST_UNAVAILABLE); } session->state = SMTP_STATE_DELAY; smtp_make_delay (session); |