summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2006-03-16 11:14:46 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2006-03-16 11:14:46 +0000
commit81e509d738395fbfd837fbda1681971591109f8a (patch)
tree9a0edf0e18aef2f489e6a9988718cb75980a71d7 /src
parente97957bc478f60d32649b329659d4b72748745c1 (diff)
User, not system, error message for VRFY defer.
Diffstat (limited to 'src')
-rw-r--r--src/src/smtp_in.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 1ed5183a6..e83235836 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/smtp_in.c,v 1.36 2006/03/08 10:49:18 ph10 Exp $ */
+/* $Cambridge: exim/src/src/smtp_in.c,v 1.37 2006/03/16 11:14:46 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3208,14 +3208,14 @@ while (done <= 0)
break;
case DEFER:
- s = (addr->message != NULL)?
- string_sprintf("451 <%s> %s", address, addr->message) :
+ s = (addr->user_message != NULL)?
+ string_sprintf("451 <%s> %s", address, addr->user_message) :
string_sprintf("451 Cannot resolve <%s> at this time", address);
break;
case FAIL:
- s = (addr->message != NULL)?
- string_sprintf("550 <%s> %s", address, addr->message) :
+ s = (addr->user_message != NULL)?
+ string_sprintf("550 <%s> %s", address, addr->user_message) :
string_sprintf("550 <%s> is not deliverable", address);
log_write(0, LOG_MAIN, "VRFY failed for %s %s",
smtp_cmd_argument, host_and_ident(TRUE));