teach makemap how to build a set, which is a map containing only keys.

smtpd is now capable of looking primary domains at runtime in a set, which
means that the following becomes possible:

	map "primary" { source db "/etc/mail/primary.db" }
	accept for domain map "primary" deliver to mbox

while at it fix a couple bugs in the aliases resolution path which caused
recipients to bounce if a ruleset did not have an "accept for local" rule

"diff reads good" jacekm@, flush queue & make clean

1 files changed, 16 insertions, 3 deletions

diff --git a/usr.sbin/smtpd/ruleset.c b/usr.sbin/smtpd/ruleset.c
index 5194d017abe..acfb6214f1b 100644
--- a/usr.sbin/smtpd/ruleset.c
+++ b/usr.sbin/smtpd/ruleset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ruleset.c,v 1.7 2009/11/03 19:13:34 gilles Exp $ */
+/*	$OpenBSD: ruleset.c,v 1.8 2009/11/03 22:57:41 gilles Exp $ */
 
 /*
  * Copyright (c) 2009 Gilles Chehade <gilles@openbsd.org>
@@ -69,11 +69,24 @@ ruleset_match(struct smtpd *env, char *tag, struct path *path, struct sockaddr_s
 				if (map == NULL)
 					fatal("failed to lookup map.");
 
-				TAILQ_FOREACH(me, &map->m_contents, me_entry) {
-					if (hostname_match(path->domain, me->me_key.med_string)) {
+				switch (map->m_src) {
+				case S_NONE:
+					TAILQ_FOREACH(me, &map->m_contents, me_entry) {
+						if (hostname_match(path->domain, me->me_key.med_string)) {
+							path->cond = cond;
+							return r;
+						}
+					}
+					break;
+				case S_DB:
+					if (map_dblookup(env, map->m_id, path->domain) != NULL) {
 						path->cond = cond;
 						return r;
 					}
+					break;
+				default:
+					log_info("unsupported map source for domain map");
+					continue;
 				}
 			}