21 files changed, 31 insertions, 120 deletions

diff --git a/usr.sbin/smtpd/enqueue.c b/usr.sbin/smtpd/enqueue.c
index 946cd8ac79f..7a36cf83599 100644
--- a/usr.sbin/smtpd/enqueue.c
+++ b/usr.sbin/smtpd/enqueue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: enqueue.c,v 1.40 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: enqueue.c,v 1.41 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2005 Henning Brauer <henning@bulabula.org>
@@ -25,18 +25,12 @@
 
 #include <ctype.h>
 #include <err.h>
-#include <errno.h>
 #include <event.h>
-#include <fcntl.h>
 #include <imsg.h>
-#include <netdb.h>
 #include <pwd.h>
-#include <signal.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "smtpd.h"
diff --git a/usr.sbin/smtpd/expand.c b/usr.sbin/smtpd/expand.c
index c823842d167..4d0a7e4473f 100644
--- a/usr.sbin/smtpd/expand.c
+++ b/usr.sbin/smtpd/expand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expand.c,v 1.10 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: expand.c,v 1.11 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2009 Gilles Chehade <gilles@openbsd.org>
@@ -22,10 +22,7 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
-#include <ctype.h>
-#include <errno.h>
 #include <event.h>
-#include <fcntl.h>
 #include <imsg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/smtpd/forward.c b/usr.sbin/smtpd/forward.c
index 5fee75956b0..800a37de8ab 100644
--- a/usr.sbin/smtpd/forward.c
+++ b/usr.sbin/smtpd/forward.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: forward.c,v 1.22 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: forward.c,v 1.23 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -24,14 +24,11 @@
 #include <sys/stat.h>
 
 #include <ctype.h>
-#include <errno.h>
 #include <event.h>
 #include <imsg.h>
-#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "smtpd.h"
 #include "log.h"
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c
index 1751d2e0267..145be0a1100 100644
--- a/usr.sbin/smtpd/lka.c
+++ b/usr.sbin/smtpd/lka.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lka.c,v 1.121 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: lka.c,v 1.122 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -25,13 +25,11 @@
 #include <sys/wait.h>
 
 #include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <event.h>
 #include <imsg.h>
-#include <netdb.h>
 #include <pwd.h>
 #include <resolv.h>
 #include <signal.h>
diff --git a/usr.sbin/smtpd/makemap.c b/usr.sbin/smtpd/makemap.c
index a04ef06fa51..942c2797268 100644
--- a/usr.sbin/smtpd/makemap.c
+++ b/usr.sbin/smtpd/makemap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: makemap.c,v 1.27 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: makemap.c,v 1.28 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -24,8 +24,8 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
-#include <ctype.h>
 #include <db.h>
+#include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <event.h>
@@ -34,8 +34,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <util.h>
+#include <unistd.h>
 
 #include "smtpd.h"
 #include "log.h"
diff --git a/usr.sbin/smtpd/map.c b/usr.sbin/smtpd/map.c
index 90efa0d10bc..96caaabacb1 100644
--- a/usr.sbin/smtpd/map.c
+++ b/usr.sbin/smtpd/map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map.c,v 1.21 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: map.c,v 1.22 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -22,12 +22,7 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
-#include <ctype.h>
-#include <db.h>
-#include <err.h>
-#include <errno.h>
 #include <event.h>
-#include <fcntl.h>
 #include <imsg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/smtpd/map_backend.c b/usr.sbin/smtpd/map_backend.c
index 150a215c576..b6ecd4fe6f7 100644
--- a/usr.sbin/smtpd/map_backend.c
+++ b/usr.sbin/smtpd/map_backend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map_backend.c,v 1.3 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: map_backend.c,v 1.4 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2010 Gilles Chehade <gilles@openbsd.org>
@@ -22,10 +22,9 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
-#include <ctype.h>
 #include <db.h>
+#include <ctype.h>
 #include <err.h>
-#include <errno.h>
 #include <event.h>
 #include <fcntl.h>
 #include <imsg.h>
diff --git a/usr.sbin/smtpd/map_parser.c b/usr.sbin/smtpd/map_parser.c
index 9c00c2fdf1c..8870f16d4a7 100644
--- a/usr.sbin/smtpd/map_parser.c
+++ b/usr.sbin/smtpd/map_parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map_parser.c,v 1.4 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: map_parser.c,v 1.5 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2010 Gilles Chehade <gilles@openbsd.org>
@@ -23,11 +23,7 @@
 #include <sys/socket.h>
 
 #include <ctype.h>
-#include <db.h>
-#include <err.h>
-#include <errno.h>
 #include <event.h>
-#include <fcntl.h>
 #include <imsg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index 2823f2e9cef..b4407200ecd 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mda.c,v 1.50 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: mda.c,v 1.51 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -24,15 +24,12 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
-#include <errno.h>
 #include <event.h>
 #include <imsg.h>
 #include <pwd.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 #include <vis.h>
 
diff --git a/usr.sbin/smtpd/mfa.c b/usr.sbin/smtpd/mfa.c
index 8c7409b19e7..e983086ce8e 100644
--- a/usr.sbin/smtpd/mfa.c
+++ b/usr.sbin/smtpd/mfa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mfa.c,v 1.53 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: mfa.c,v 1.54 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -23,11 +23,9 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
-#include <ctype.h>
 #include <event.h>
 #include <imsg.h>
 #include <pwd.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index 43754f609c9..390e8fc8639 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mta.c,v 1.95 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: mta.c,v 1.96 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -24,19 +24,14 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include <errno.h>
 #include <event.h>
 #include <imsg.h>
 #include <netdb.h>
 #include <pwd.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "smtpd.h"
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index 4021c83f2f1..c07f3f1318b 100644
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.71 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: parse.y,v 1.72 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -38,15 +38,10 @@
 #include <event.h>
 #include <ifaddrs.h>
 #include <imsg.h>
-#include <limits.h>
+#include <netdb.h>
 #include <paths.h>
 #include <pwd.h>
-#include <netdb.h>
-#include <stdarg.h>
 #include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <util.h>
 
diff --git a/usr.sbin/smtpd/parser.c b/usr.sbin/smtpd/parser.c
index dddc43a303d..26adc172f86 100644
--- a/usr.sbin/smtpd/parser.c
+++ b/usr.sbin/smtpd/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.17 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: parser.c,v 1.18 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -24,18 +24,8 @@
 #include <sys/tree.h>
 #include <sys/param.h>
 
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <err.h>
-#include <errno.h>
-#include <imsg.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <event.h>
+#include <imsg.h>
 
 #include <openssl/ssl.h>
 
diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c
index 34058eb2102..b1f177f95b1 100644
--- a/usr.sbin/smtpd/queue.c
+++ b/usr.sbin/smtpd/queue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue.c,v 1.92 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: queue.c,v 1.93 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -24,13 +24,10 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 
-#include <errno.h>
 #include <event.h>
 #include <imsg.h>
-#include <fcntl.h>
 #include <libgen.h>
 #include <pwd.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/smtpd/queue_shared.c b/usr.sbin/smtpd/queue_shared.c
index 7c600da5e07..c4d19cd24ae 100644
--- a/usr.sbin/smtpd/queue_shared.c
+++ b/usr.sbin/smtpd/queue_shared.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_shared.c,v 1.34 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: queue_shared.c,v 1.35 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -29,13 +29,11 @@
 #include <err.h>
 #include <errno.h>
 #include <event.h>
-#include <imsg.h>
 #include <fcntl.h>
-#include <pwd.h>
+#include <imsg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "smtpd.h"
diff --git a/usr.sbin/smtpd/ruleset.c b/usr.sbin/smtpd/ruleset.c
index c32b4b8e104..d50bffee02e 100644
--- a/usr.sbin/smtpd/ruleset.c
+++ b/usr.sbin/smtpd/ruleset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ruleset.c,v 1.14 2010/11/28 13:56:43 gilles Exp $ */
+/*	$OpenBSD: ruleset.c,v 1.15 2010/11/28 14:35:58 gilles Exp $ */
 
 /*
  * Copyright (c) 2009 Gilles Chehade <gilles@openbsd.org>
@@ -23,15 +23,10 @@
 #include <sys/socket.h>
 
 #include <netinet/in.h>
-#include <arpa/inet.h>
 
-#include <db.h>
-#include <errno.h>
 #include <event.h>
 #include <imsg.h>
-#include <fcntl.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "smtpd.h"
diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c
index aa6e44b0a51..a91099d42dd 100644
--- a/usr.sbin/smtpd/runner.c
+++ b/usr.sbin/smtpd/runner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: runner.c,v 1.94 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: runner.c,v 1.95 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -25,24 +25,17 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include <ctype.h>
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
 #include <event.h>
-#include <fcntl.h>
 #include <imsg.h>
 #include <libgen.h>
-#include <netdb.h>
 #include <pwd.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "smtpd.h"
diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c
index b9503600516..2c4ec75b66e 100644
--- a/usr.sbin/smtpd/smtp.c
+++ b/usr.sbin/smtpd/smtp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtp.c,v 1.78 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: smtp.c,v 1.79 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -24,20 +24,14 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
 #include <errno.h>
 #include <event.h>
 #include <imsg.h>
 #include <netdb.h>
 #include <pwd.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "smtpd.h"
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 795892a600b..cd24c54d2ce 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtp_session.c,v 1.137 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: smtp_session.c,v 1.138 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -25,22 +25,17 @@
 #include <sys/socket.h>
 
 #include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/ssl.h>
 
 #include <ctype.h>
-#include <errno.h>
 #include <event.h>
 #include <imsg.h>
-#include <pwd.h>
-#include <regex.h>
 #include <resolv.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
+#include <openssl/ssl.h>
+
 #include "smtpd.h"
 #include "log.h"
 
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index f628542e49e..41dc84d1b24 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpctl.c,v 1.54 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: smtpctl.c,v 1.55 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -26,21 +26,13 @@
 #include <sys/un.h>
 #include <sys/param.h>
 
-#include <net/if.h>
-#include <net/if_media.h>
-#include <net/if_types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include <err.h>
-#include <errno.h>
+#include <event.h>
 #include <imsg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
-#include <event.h>
 
 #include "smtpd.h"
 #include "parser.h"
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 835f0da64d4..9d3926da9c4 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.c,v 1.114 2010/11/28 13:56:43 gilles Exp $	*/
+/*	$OpenBSD: smtpd.c,v 1.115 2010/11/28 14:35:58 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -30,19 +30,15 @@
 
 #include <err.h>
 #include <errno.h>
-#include <event.h>
 #include <fcntl.h>
+#include <event.h>
 #include <imsg.h>
-#include <login_cap.h>
 #include <paths.h>
 #include <pwd.h>
-#include <regex.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sysexits.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "smtpd.h"