summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-12-10 15:02:31 +0000
committerJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-12-10 15:02:31 +0000
commitea112d96b48a96b994250f5fb0cf81e876c314ec (patch)
treef9b536615d6c25a3f89f9149e0ede7a73a7fc18d /usr.sbin
parent14db1f30170bf884d33c731c4e22dfeb66fa9d51 (diff)
Fix a case when 2yz status would not override existing 4yz one.
Reported by jsing@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/mta.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index 8db9bce1452..216d1ab1c7c 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mta.c,v 1.78 2009/12/07 15:33:42 jsing Exp $ */
+/* $OpenBSD: mta.c,v 1.79 2009/12/10 15:02:30 jacekm Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -901,7 +901,7 @@ mta_message_status(struct message *m, char *status)
* higher status (eg. 5yz is of higher status than 4yz), so check
* this before deciding to overwrite existing status with a new one.
*/
- if (strncmp(m->session_errorline, status, 3) > 0)
+ if (*status != '2' && strncmp(m->session_errorline, status, 3) > 0)
return;
/* change status */