summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgilles <gilles@openbsd.org>2015-11-24 07:40:26 +0000
committergilles <gilles@openbsd.org>2015-11-24 07:40:26 +0000
commit0b2a1b239121514271c215f895a7a89d52b8baf6 (patch)
treeec861dd8e698c27301893436db5f8bfd09779006
parentDon't support repeated connections - avoids pledge problems (diff)
downloadwireguard-openbsd-0b2a1b239121514271c215f895a7a89d52b8baf6.tar.xz
wireguard-openbsd-0b2a1b239121514271c215f895a7a89d52b8baf6.zip
teach table_db and table_static about mailaddr maps (unused yet)
ok sunil@, ok jung@
-rw-r--r--usr.sbin/smtpd/table_db.c4
-rw-r--r--usr.sbin/smtpd/table_static.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/table_db.c b/usr.sbin/smtpd/table_db.c
index dd71684d575..fa56abc56eb 100644
--- a/usr.sbin/smtpd/table_db.c
+++ b/usr.sbin/smtpd/table_db.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: table_db.c,v 1.8 2015/01/20 17:37:54 deraadt Exp $ */
+/* $OpenBSD: table_db.c,v 1.9 2015/11/24 07:40:26 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
@@ -52,7 +52,7 @@ static char *table_db_get_entry_match(void *, const char *, size_t *,
int(*)(const char *, const char *));
struct table_backend table_backend_db = {
- K_ALIAS|K_CREDENTIALS|K_DOMAIN|K_NETADDR|K_USERINFO|K_SOURCE|K_MAILADDR|K_ADDRNAME,
+ K_ALIAS|K_CREDENTIALS|K_DOMAIN|K_NETADDR|K_USERINFO|K_SOURCE|K_MAILADDR|K_ADDRNAME|K_MAILADDRMAP,
table_db_config,
table_db_open,
table_db_update,
diff --git a/usr.sbin/smtpd/table_static.c b/usr.sbin/smtpd/table_static.c
index 5ce96894e56..b7d66aa7ed9 100644
--- a/usr.sbin/smtpd/table_static.c
+++ b/usr.sbin/smtpd/table_static.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: table_static.c,v 1.11 2015/10/11 12:50:00 sunil Exp $ */
+/* $OpenBSD: table_static.c,v 1.12 2015/11/24 07:40:26 gilles Exp $ */
/*
* Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@@ -49,7 +49,7 @@ static void table_static_close(void *);
static int table_static_parse(struct table *, const char *, enum table_type);
struct table_backend table_backend_static = {
- K_ALIAS|K_CREDENTIALS|K_DOMAIN|K_NETADDR|K_USERINFO|K_SOURCE|K_MAILADDR|K_ADDRNAME,
+ K_ALIAS|K_CREDENTIALS|K_DOMAIN|K_NETADDR|K_USERINFO|K_SOURCE|K_MAILADDR|K_ADDRNAME|K_MAILADDRMAP,
table_static_config,
table_static_open,
table_static_update,