cleanup; ok gilles@

3 files changed, 14 insertions, 15 deletions

diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c
index 5e50b653426..c02722420b7 100644
--- a/usr.sbin/smtpd/lka.c
+++ b/usr.sbin/smtpd/lka.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lka.c,v 1.13 2009/01/04 00:58:59 gilles Exp $	*/
+/*	$OpenBSD: lka.c,v 1.14 2009/01/04 14:46:14 jacekm Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -54,7 +54,7 @@ size_t		getmxbyname(char *, char ***);
 int		lka_expand(char *, size_t, struct path *);
 int		aliases_exist(struct smtpd *, char *);
 int		aliases_get(struct smtpd *, struct aliaseslist *, char *);
-int		lka_resolve_alias(struct smtpd *, struct path *, struct alias *);
+int		lka_resolve_alias(struct path *, struct alias *);
 int		lka_parse_include(char *);
 int		forwards_get(struct aliaseslist *, char *);
 int		lka_check_source(struct smtpd *, struct map *, struct sockaddr_storage *);
@@ -225,7 +225,7 @@ lka_dispatch_mfa(int sig, short event, void *p)
 					message = ss->msg;
 					while ((alias = TAILQ_FIRST(&aliases)) != NULL) {
 						bzero(&message.recipient, sizeof (struct path));
-						lka_resolve_alias(env, &message.recipient, alias);
+						lka_resolve_alias(&message.recipient, alias);
 						imsg_compose(env->sc_ibufs[PROC_QUEUE],
 						    IMSG_QUEUE_SUBMIT_ENVELOPE, 0, 0, -1, &message,
 						    sizeof (struct message));
@@ -791,7 +791,7 @@ lka_expand(char *buf, size_t len, struct path *path)
 }
 
 int
-lka_resolve_alias(struct smtpd *env, struct path *path, struct alias *alias)
+lka_resolve_alias(struct path *path, struct alias *alias)
 {
 	switch (alias->type) {
 	case ALIAS_USERNAME:
@@ -818,8 +818,8 @@ lka_resolve_alias(struct smtpd *env, struct path *path, struct alias *alias)
 		log_debug("ADDRESS: %s@%s", alias->u.path.user, alias->u.path.domain);
 		*path = alias->u.path;
 		break;
-	default:
-		/* ALIAS_INCLUDE cannot happen here, make gcc shut up */
+	case ALIAS_INCLUDE:
+		fatalx("lka_resolve_alias: unexpected type");
 		break;
 	}
 	return 1;
@@ -844,10 +844,11 @@ lka_expand_aliases(struct smtpd *env, struct aliaseslist *aliases, struct path *
 		ret = aliases_get(env, aliases, path->user);
 	else if (path->flags & F_VIRTUAL)
 		ret = aliases_virtual_get(env, aliases, path);
+	else
+		fatalx("lka_expand_aliases: invalid path type");
 
 	if (! ret)
 		return 0;
-	
 
 	while (!done && iterations--) {
 		done = 1;
diff --git a/usr.sbin/smtpd/mfa.c b/usr.sbin/smtpd/mfa.c
index 18d6fcc7d21..975d125ac7c 100644
--- a/usr.sbin/smtpd/mfa.c
+++ b/usr.sbin/smtpd/mfa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mfa.c,v 1.6 2009/01/04 00:58:59 gilles Exp $	*/
+/*	$OpenBSD: mfa.c,v 1.7 2009/01/04 14:46:14 jacekm Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -30,7 +30,7 @@
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "smtpd.h"
@@ -45,7 +45,7 @@ void		mfa_disable_events(struct smtpd *);
 void		mfa_timeout(int, short, void *);
 
 int		mfa_check_rcpt(struct smtpd *, struct path *, struct sockaddr_storage *);
-int		mfa_check_source(struct smtpd *, struct map *, struct sockaddr_storage *);
+int		mfa_check_source(struct map *, struct sockaddr_storage *);
 int		mfa_match_mask(struct sockaddr_storage *, struct netaddr *);
 
 void
@@ -379,7 +379,7 @@ mfa_check_rcpt(struct smtpd *env, struct path *path, struct sockaddr_storage *ss
 	struct mapel *me;
 
 	TAILQ_FOREACH(r, env->sc_rules, r_entry) {
-		if (! mfa_check_source(env, r->r_sources, ss))
+		if (! mfa_check_source(r->r_sources, ss))
 			continue;
 
 		log_debug("client authorized");
@@ -409,7 +409,7 @@ mfa_check_rcpt(struct smtpd *env, struct path *path, struct sockaddr_storage *ss
 }
 
 int
-mfa_check_source(struct smtpd *env, struct map *map, struct sockaddr_storage *ss)
+mfa_check_source(struct map *map, struct sockaddr_storage *ss)
 {
 	struct mapel *me;
 
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index c77de671eb2..486896e83a4 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.h,v 1.38 2009/01/04 00:58:59 gilles Exp $	*/
+/*	$OpenBSD: smtpd.h,v 1.39 2009/01/04 14:46:14 jacekm Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -163,9 +163,7 @@ enum imsg_type {
 	IMSG_CONF_RELOAD,
 	IMSG_LKA_MAIL,
 	IMSG_LKA_RCPT,
-	IMSG_LKA_ALIAS,
 	IMSG_LKA_MX,
-	IMSG_LKA_FORWARD,
 	IMSG_LKA_HOST,
 	IMSG_MDA_MAILBOX_FILE,
 	IMSG_MDA_MESSAGE_FILE,