diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2019-01-03 14:42:10 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2019-01-03 14:42:10 +0100 |
| commit | 8aef4c8e5c072fecd447ea08fe01fc2b4c2aa794 (patch) | |
| tree | 886d3c9d4f3c2deddc924788920a883cadda510b /smtpd/lka.c | |
| parent | Merge branch 'master' into portable (diff) | |
| parent | sync (diff) | |
| download | OpenSMTPD-8aef4c8e5c072fecd447ea08fe01fc2b4c2aa794.tar.xz OpenSMTPD-8aef4c8e5c072fecd447ea08fe01fc2b4c2aa794.zip | |
Merge branch 'master' into portable
Diffstat (limited to 'smtpd/lka.c')
| -rw-r--r-- | smtpd/lka.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/smtpd/lka.c b/smtpd/lka.c index 0291d49b..eb7b2cac 100644 --- a/smtpd/lka.c +++ b/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.231 2018/12/26 20:13:43 eric Exp $ */ +/* $OpenBSD: lka.c,v 1.232 2018/12/28 11:40:29 eric Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -227,7 +227,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg) m_get_string(&m, &tablename); m_end(&m); - table = table_find(env, tablename, NULL); + table = table_find(env, tablename); m_create(p, IMSG_MTA_LOOKUP_SOURCE, 0, 0, -1); m_add_id(p, reqid); @@ -276,7 +276,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg) m_get_string(&m, &tablename); m_end(&m); - table = table_find(env, tablename, NULL); + table = table_find(env, tablename); m_create(p, IMSG_MTA_LOOKUP_SMARTHOST, 0, 0, -1); m_add_id(p, reqid); @@ -346,7 +346,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg) case IMSG_CTL_UPDATE_TABLE: ret = 0; - table = table_find(env, imsg->data, NULL); + table = table_find(env, imsg->data); if (table == NULL) { log_warnx("warn: Lookup table not found: " "\"%s\"", (char *)imsg->data); @@ -686,7 +686,7 @@ lka_authenticate(const char *tablename, const char *user, const char *password) union lookup lk; log_debug("debug: lka: authenticating for %s:%s", tablename, user); - table = table_find(env, tablename, NULL); + table = table_find(env, tablename); if (table == NULL) { log_warnx("warn: could not find table %s needed for authentication", tablename); @@ -715,7 +715,7 @@ lka_credentials(const char *tablename, const char *label, char *dst, size_t sz) char *buf; int buflen, r; - table = table_find(env, tablename, NULL); + table = table_find(env, tablename); if (table == NULL) { log_warnx("warn: credentials table %s missing", tablename); return (LKA_TEMPFAIL); @@ -758,7 +758,7 @@ lka_userinfo(const char *tablename, const char *username, struct userinfo *res) union lookup lk; log_debug("debug: lka: userinfo %s:%s", tablename, username); - table = table_find(env, tablename, NULL); + table = table_find(env, tablename); if (table == NULL) { log_warnx("warn: cannot find user table %s", tablename); return (LKA_TEMPFAIL); @@ -788,7 +788,7 @@ lka_addrname(const char *tablename, const struct sockaddr *sa, source = sa_to_text(sa); log_debug("debug: lka: helo %s:%s", tablename, source); - table = table_find(env, tablename, NULL); + table = table_find(env, tablename); if (table == NULL) { log_warnx("warn: cannot find helo table %s", tablename); return (LKA_TEMPFAIL); @@ -816,7 +816,7 @@ lka_mailaddrmap(const char *tablename, const char *username, const struct mailad int found; log_debug("debug: lka: mailaddrmap %s:%s", tablename, username); - table = table_find(env, tablename, NULL); + table = table_find(env, tablename); if (table == NULL) { log_warnx("warn: cannot find mailaddrmap table %s", tablename); return (LKA_TEMPFAIL); |