diff options
| author |   gilles <gilles@openbsd.org> | 2015-11-30 14:05:34 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2015-11-30 14:05:34 +0000 |
| commit | d5f10ab5fd7d1147d3dcc1e88be128d4d085e457 (patch) | |
| tree | 9858dd127298905e2523b5ac71204637974e32fc | |
| parent | handle "mda command too long" as a tempfail (diff) | |
| download | wireguard-openbsd-d5f10ab5fd7d1147d3dcc1e88be128d4d085e457.tar.xz wireguard-openbsd-d5f10ab5fd7d1147d3dcc1e88be128d4d085e457.zip | |
bring lka_mailaddrmap(), currently unused, required by sendermap/masquerade
ok jung@
| -rw-r--r-- | usr.sbin/smtpd/lka.c | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index 9e70351e7fc..9baab9811ce 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.179 2015/11/30 12:49:35 gilles Exp $ */ +/* $OpenBSD: lka.c,v 1.180 2015/11/30 14:05:34 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -55,6 +55,7 @@ static int lka_credentials(const char *, const char *, char *, size_t); static int lka_userinfo(const char *, const char *, struct userinfo *); static int lka_addrname(const char *, const struct sockaddr *, struct addrname *); +static int lka_mailaddrmap(const char *, const char *, const struct mailaddr *); static int lka_X509_verify(struct ca_vrfy_req_msg *, const char *, const char *); static void @@ -657,6 +658,44 @@ lka_addrname(const char *tablename, const struct sockaddr *sa, } static int +lka_mailaddrmap(const char *tablename, const char *username, const struct mailaddr *maddr) +{ + struct table *table; + struct maddrnode *mn; + union lookup lk; + int found; + + log_debug("debug: lka: mailaddrmap %s:%s", tablename, username); + table = table_find(tablename, NULL); + if (table == NULL) { + log_warnx("warn: cannot find mailaddrmap table %s", tablename); + return (LKA_TEMPFAIL); + } + + switch (table_lookup(table, NULL, username, K_MAILADDRMAP, &lk)) { + case -1: + log_warnx("warn: failure during mailaddrmap lookup %s:%s", + tablename, username); + return (LKA_TEMPFAIL); + case 0: + return (LKA_PERMFAIL); + default: + found = 0; + TAILQ_FOREACH(mn, &lk.maddrmap->queue, entries) { + if (! mailaddr_match(maddr, &mn->mailaddr)) + continue; + found = 1; + break; + } + maddrmap_free(lk.maddrmap); + if (found) + return (LKA_OK); + return (LKA_PERMFAIL); + } + return (LKA_OK); +} + +static int lka_X509_verify(struct ca_vrfy_req_msg *vrfy, const char *CAfile, const char *CRLfile) { |