aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Chehade <gilles@poolp.org>2013-12-14 20:32:14 +0100
committerGilles Chehade <gilles@poolp.org>2013-12-14 20:32:14 +0100
commit9e03fb67d3508a77bc65c135ce942358ef448f96 (patch)
tree604567592f7a7e59de52c0713a1607b1d96f2d4d
parentremove penalty mechanism on envelopes (diff)
downloadOpenSMTPD-opensmtpd-201312142053.tar.xz
OpenSMTPD-opensmtpd-201312142053.zip
woops, API change not propagated to mda.copensmtpd-201312142053
-rw-r--r--smtpd/mda.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/smtpd/mda.c b/smtpd/mda.c
index e8edf33a..2fdd16a6 100644
--- a/smtpd/mda.c
+++ b/smtpd/mda.c
@@ -204,7 +204,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
if (imsg->fd == -1) {
log_debug("debug: mda: cannot get message fd");
- queue_tempfail(e->id, 0, "Cannot get message fd");
+ queue_tempfail(e->id, "Cannot get message fd");
mda_log(e, "TempFail", "Cannot get message fd");
mda_done(s);
return;
@@ -217,7 +217,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
if ((s->datafp = fdopen(imsg->fd, "r")) == NULL) {
log_warn("warn: mda: fdopen");
close(imsg->fd);
- queue_tempfail(e->id, 0, "fdopen failed");
+ queue_tempfail(e->id, "fdopen failed");
mda_log(e, "TempFail", "fdopen failed");
mda_done(s);
return;
@@ -245,7 +245,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
if (n == -1) {
log_warn("warn: mda: "
"fail to write delivery info");
- queue_tempfail(e->id, 0, "Out of memory");
+ queue_tempfail(e->id, "Out of memory");
mda_log(e, "TempFail", "Out of memory");
mda_done(s);
return;
@@ -336,7 +336,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
e = s->evp;
if (imsg->fd == -1) {
log_warn("warn: mda: fail to retrieve mda fd");
- queue_tempfail(e->id, 0, "Cannot get mda fd");
+ queue_tempfail(e->id, "Cannot get mda fd");
mda_log(e, "TempFail", "Cannot get mda fd");
mda_done(s);
return;
@@ -379,7 +379,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
/* update queue entry */
if (error) {
- queue_tempfail(e->id, 0, error);
+ queue_tempfail(e->id, error);
snprintf(buf, sizeof buf, "Error (%s)", error);
mda_log(e, "TempFail", buf);
}
@@ -674,7 +674,7 @@ mda_fail(struct mda_user *user, int permfail, const char *error)
}
else {
mda_log(e, "TempFail", error);
- queue_tempfail(e->id, 0, error);
+ queue_tempfail(e->id, error);
}
mda_envelope_free(e);
}