diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-18 14:23:02 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-18 14:23:02 +0000 |
| commit | 9c2027d84e17e5ebe5f48d8d85236efe74e23c7b (patch) | |
| tree | 7aa1a0379517a751bd2dc280dd5644a31d3ba05f /usr.sbin/smtpd/lka_session.c | |
| parent | 1525b63ac4883d0e21cddface415d96740a2fe86 (diff) | |
- add xmemdup() helper.
- remove useless block in switch.
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/lka_session.c')
| -rw-r--r-- | usr.sbin/smtpd/lka_session.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/usr.sbin/smtpd/lka_session.c b/usr.sbin/smtpd/lka_session.c index a33977b536c..ebfb374d512 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.25 2012/09/18 13:42:39 eric Exp $ */ +/* $OpenBSD: lka_session.c,v 1.26 2012/09/18 14:23:01 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> @@ -91,7 +91,7 @@ lka_session_envelope_expand(struct lka_session *lks, struct envelope *ep) switch (ep->rule.r_condition.c_type) { case C_ALL: - case C_DOM: { + case C_DOM: if (ep->agent.mda.to.user[0] == '\0') user = ep->dest.user; else @@ -153,9 +153,8 @@ lka_session_envelope_expand(struct lka_session *lks, struct envelope *ep) lka_session_request_forwardfile(lks, ep, u.username); return 1; - } - case C_VDOM: { + case C_VDOM: if (aliases_virtual_exist(ep->rule.r_condition.c_map, &ep->dest)) { if (! aliases_virtual_get(ep->rule.r_condition.c_map, &lks->expandtree, &ep->dest)) @@ -163,7 +162,6 @@ lka_session_envelope_expand(struct lka_session *lks, struct envelope *ep) return 1; } return 0; - } default: fatalx("lka_session_envelope_expand: unexpected type"); @@ -344,10 +342,7 @@ lka_session_deliver(struct lka_session *lks, struct envelope *ep) { struct envelope *new_ep; - new_ep = calloc(1, sizeof (*ep)); - if (new_ep == NULL) - fatal("lka_session_deliver: calloc"); - *new_ep = *ep; + new_ep = xmemdup(ep, sizeof *ep, "lka_session_deliver"); if (new_ep->type == D_MDA) { switch (new_ep->agent.mda.method) { case A_MAILDIR: |