summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2011-05-21 18:11:41 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2011-05-21 18:11:41 +0000
commitde29e774824ca16d3da070dfa3b0c1e5c38bfb90 (patch)
tree440b589eefeb4bc849e30cd15d12211044a80d65
parentd2953cf429d3f22943f876b8925884b25b9ee519 (diff)
these log_debug()s should not have been committed :)
-rw-r--r--usr.sbin/smtpd/lka_session.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/usr.sbin/smtpd/lka_session.c b/usr.sbin/smtpd/lka_session.c
index a3157efdd1a..3a2d858b71a 100644
--- a/usr.sbin/smtpd/lka_session.c
+++ b/usr.sbin/smtpd/lka_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lka_session.c,v 1.5 2011/05/21 18:04:51 gilles Exp $ */
+/* $OpenBSD: lka_session.c,v 1.6 2011/05/21 18:11:40 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -116,12 +116,9 @@ lka_session_envelope_expand(struct lka_session *lks, struct envelope *ep)
(void)strlcpy(ep->delivery.agent.mda.as_user, u.username,
sizeof (ep->delivery.agent.mda.as_user));
- log_debug("###1");
-
ep->delivery.type = D_MDA;
switch (ep->rule.r_action) {
case A_MBOX:
- log_debug("###1.1");
ep->delivery.agent.mda.method = A_MBOX;
(void)strlcpy(ep->delivery.agent.mda.to.user,
u.username,
@@ -130,7 +127,6 @@ lka_session_envelope_expand(struct lka_session *lks, struct envelope *ep)
case A_MAILDIR:
case A_FILENAME:
case A_EXT:
- log_debug("###1.2");
ep->delivery.agent.mda.method = ep->rule.r_action;
(void)strlcpy(ep->delivery.agent.mda.to.buffer,
ep->rule.r_value.buffer,
@@ -141,7 +137,6 @@ lka_session_envelope_expand(struct lka_session *lks, struct envelope *ep)
return 0;
}
- log_debug("###2");
lka_session_request_forwardfile(lks, ep, u.username);
return 1;
}
@@ -243,7 +238,7 @@ lka_session_pickup(struct lka_session *lks, struct envelope *ep)
if (lks->pending)
return;
- log_debug("#2plop: %d", ep->delivery.agent.mda.method);
+
lka_session_done(lks);
}
@@ -253,8 +248,6 @@ lka_session_resume(struct lka_session *lks, struct envelope *ep)
struct expandnode *xn;
u_int8_t done = 1;
- log_debug("#1plop: %d", ep->delivery.agent.mda.method);
-
RB_FOREACH(xn, expandtree, &lks->expandtree) {
/* this node has already been expanded, skip */