diff options
Diffstat (limited to 'usr.sbin/smtpd/bounce.c')
| -rw-r--r-- | usr.sbin/smtpd/bounce.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/bounce.c b/usr.sbin/smtpd/bounce.c index 91c3d67749f..56f8d78d3da 100644 --- a/usr.sbin/smtpd/bounce.c +++ b/usr.sbin/smtpd/bounce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bounce.c,v 1.9 2009/09/16 15:33:06 jacekm Exp $ */ +/* $OpenBSD: bounce.c,v 1.10 2009/11/05 12:05:47 jsing Exp $ */ /* * Copyright (c) 2009 Gilles Chehade <gilles@openbsd.org> @@ -55,6 +55,7 @@ bounce_session(struct smtpd *env, int fd, struct message *messagep) { struct client_ctx *cc = NULL; int msgfd = -1; + char *reason; /* init smtp session */ if ((cc = calloc(1, sizeof(*cc))) == NULL) @@ -71,6 +72,11 @@ bounce_session(struct smtpd *env, int fd, struct message *messagep) messagep->sender.domain) < 0) goto fail; + /* Construct an appropriate reason line. */ + reason = messagep->session_errorline; + if (strlen(reason) > 4 && (*reason == '1' || *reason == '6')) + reason += 4; + /* create message header */ if (client_data_printf(cc->sp, "Subject: Delivery status notification\n" @@ -91,7 +97,7 @@ bounce_session(struct smtpd *env, int fd, struct message *messagep) env->sc_hostname, messagep->sender.user, messagep->sender.domain, messagep->recipient.user, messagep->recipient.domain, - messagep->session_errorline) < 0) + reason) < 0) goto fail; /* append original message */ |