coding style: replace all occurences of u_int* with uint*

ok eric@

22 files changed, 266 insertions, 266 deletions

diff --git a/usr.sbin/smtpd/config.c b/usr.sbin/smtpd/config.c
index 4e0368189a7..8e555898846 100644
--- a/usr.sbin/smtpd/config.c
+++ b/usr.sbin/smtpd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.15 2011/05/01 12:57:11 eric Exp $	*/
+/*	$OpenBSD: config.c,v 1.16 2012/08/19 14:16:57 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -31,12 +31,12 @@
 #include "smtpd.h"
 #include "log.h"
 
-static int is_peer(struct peer *, enum smtp_proc_type, u_int);
+static int is_peer(struct peer *, enum smtp_proc_type, uint);
 
 static int
-is_peer(struct peer *p, enum smtp_proc_type peer, u_int peercount)
+is_peer(struct peer *p, enum smtp_proc_type peer, uint peercount)
 {
-	u_int	i;
+	uint	i;
 
 	for (i = 0; i < peercount; i++)
 		if (p[i].id == peer)
@@ -55,7 +55,7 @@ configure(void)
 }
 
 void
-purge_config(u_int8_t what)
+purge_config(uint8_t what)
 {
 	struct listener	*l;
 	struct map	*m;
@@ -149,10 +149,10 @@ init_pipes(void)
 }
 
 void
-config_pipes(struct peer *p, u_int peercount)
+config_pipes(struct peer *p, uint peercount)
 {
-	u_int	i;
-	u_int	j;
+	uint	i;
+	uint	j;
 	int	count;
 
 	/*
@@ -184,12 +184,12 @@ config_pipes(struct peer *p, u_int peercount)
 }
 
 void
-config_peers(struct peer *p, u_int peercount)
+config_peers(struct peer *p, uint peercount)
 {
 	int	count;
-	u_int	src;
-	u_int	dst;
-	u_int	i;
+	uint	src;
+	uint	dst;
+	uint	i;
 	/*
 	 * listen on appropriate pipes
 	 */
diff --git a/usr.sbin/smtpd/dns.c b/usr.sbin/smtpd/dns.c
index 03746eb0987..9b0a25ef0fa 100644
--- a/usr.sbin/smtpd/dns.c
+++ b/usr.sbin/smtpd/dns.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dns.c,v 1.52 2012/08/18 18:18:23 gilles Exp $	*/
+/*	$OpenBSD: dns.c,v 1.53 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -47,7 +47,7 @@ struct mx {
 
 struct dnssession {
 	SPLAY_ENTRY(dnssession)		 nodes;
-	u_int64_t			 id;
+	uint64_t			 id;
 	struct dns			 query;
 	struct event			 ev;
 	struct async			*as;
@@ -82,7 +82,7 @@ static void dns_reply(struct dns *, int);
  */
 
 void
-dns_query_host(char *host, int port, u_int64_t id)
+dns_query_host(char *host, int port, uint64_t id)
 {
 	struct dns	 query;
 
@@ -96,7 +96,7 @@ dns_query_host(char *host, int port, u_int64_t id)
 }
 
 void
-dns_query_mx(char *host, int port, u_int64_t id)
+dns_query_mx(char *host, int port, uint64_t id)
 {
 	struct dns	 query;
 
@@ -110,7 +110,7 @@ dns_query_mx(char *host, int port, u_int64_t id)
 }
 
 void
-dns_query_ptr(struct sockaddr_storage *ss, u_int64_t id)
+dns_query_ptr(struct sockaddr_storage *ss, uint64_t id)
 {
 	struct dns	 query;
 
@@ -398,7 +398,7 @@ static int
 dnssession_cmp(struct dnssession *s1, struct dnssession *s2)
 {
 	/*
-	 * do not return u_int64_t's
+	 * do not return uint64_t's
 	 */
 	if (s1->id < s2->id)
 		return (-1);
diff --git a/usr.sbin/smtpd/enqueue.c b/usr.sbin/smtpd/enqueue.c
index db9df4743ac..43248872227 100644
--- a/usr.sbin/smtpd/enqueue.c
+++ b/usr.sbin/smtpd/enqueue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: enqueue.c,v 1.56 2012/03/17 13:10:03 gilles Exp $	*/
+/*	$OpenBSD: enqueue.c,v 1.57 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2005 Henning Brauer <henning@bulabula.org>
@@ -114,10 +114,10 @@ struct {
 } msg;
 
 struct {
-	u_int		quote;
-	u_int		comment;
-	u_int		esc;
-	u_int		brackets;
+	uint		quote;
+	uint		comment;
+	uint		esc;
+	uint		brackets;
 	size_t		wpos;
 	char		buf[SMTP_LINELEN];
 } pstate;
@@ -443,8 +443,8 @@ parse_message(FILE *fin, int get_from, int tflag, FILE *fout)
 {
 	char	*buf;
 	size_t	 len;
-	u_int	 i, cur = HDR_NONE;
-	u_int	 header_seen = 0, header_done = 0;
+	uint	 i, cur = HDR_NONE;
+	uint	 header_seen = 0, header_done = 0;
 
 	bzero(&pstate, sizeof(pstate));
 	for (;;) {
diff --git a/usr.sbin/smtpd/envelope.c b/usr.sbin/smtpd/envelope.c
index ce0bc6d3917..fcff47361d9 100644
--- a/usr.sbin/smtpd/envelope.c
+++ b/usr.sbin/smtpd/envelope.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: envelope.c,v 1.7 2012/08/19 10:32:32 chl Exp $	*/
+/*	$OpenBSD: envelope.c,v 1.8 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -44,32 +44,32 @@
 #include "smtpd.h"
 #include "log.h"
 
-static int ascii_load_uint8(u_int8_t *, char *);
-static int ascii_load_uint16(u_int16_t *, char *);
-static int ascii_load_uint32(u_int32_t *, char *);
+static int ascii_load_uint8(uint8_t *, char *);
+static int ascii_load_uint16(uint16_t *, char *);
+static int ascii_load_uint32(uint32_t *, char *);
 static int ascii_load_time(time_t *, char *);
-static int ascii_load_uint32_hex(u_int32_t *, char *);
-static int ascii_load_uint64_hex(u_int64_t *, char *);
+static int ascii_load_uint32_hex(uint32_t *, char *);
+static int ascii_load_uint64_hex(uint64_t *, char *);
 static int ascii_load_type(enum delivery_type *, char *);
 static int ascii_load_string(char *, char *, size_t);
 static int ascii_load_sockaddr(struct sockaddr_storage *, char *);
 static int ascii_load_mda_method(enum action_type *, char *);
 static int ascii_load_mailaddr(struct mailaddr *, char *);
 static int ascii_load_flags(enum delivery_flags *, char *);
-static int ascii_load_mta_relay_flags(u_int8_t *, char *);
+static int ascii_load_mta_relay_flags(uint8_t *, char *);
 
-static int ascii_dump_uint8(u_int8_t, char *, size_t);
-static int ascii_dump_uint32(u_int32_t, char *, size_t);
+static int ascii_dump_uint8(uint8_t, char *, size_t);
+static int ascii_dump_uint32(uint32_t, char *, size_t);
 static int ascii_dump_time(time_t, char *, size_t);
-static int ascii_dump_uint32_hex(u_int32_t, char *, size_t);
-static int ascii_dump_uint64_hex(u_int64_t, char *, size_t);
+static int ascii_dump_uint32_hex(uint32_t, char *, size_t);
+static int ascii_dump_uint64_hex(uint64_t, char *, size_t);
 static int ascii_dump_string(char *, char *, size_t);
 static int ascii_dump_type(enum delivery_type, char *, size_t);
 static int ascii_dump_mda_method(enum action_type, char *, size_t);
 static int ascii_dump_mailaddr(struct mailaddr *, char *, size_t);
 static int ascii_dump_flags(enum delivery_flags, char *, size_t);
-static int ascii_dump_mta_relay_port(u_int16_t, char *, size_t);
-static int ascii_dump_mta_relay_flags(u_int8_t, char *, size_t);
+static int ascii_dump_mta_relay_port(uint16_t, char *, size_t);
+static int ascii_dump_mta_relay_flags(uint8_t, char *, size_t);
 
 void
 envelope_set_errormsg(struct envelope *e, char *fmt, ...)
@@ -365,7 +365,7 @@ envelope_ascii_load(enum envelope_field field, struct envelope *ep, char *buf)
 		return ascii_load_string(ep->agent.mta.relay.hostname, buf,
 		    sizeof ep->agent.mta.relay.hostname);
 	case EVP_MTA_RELAY_PORT: {
-		u_int16_t port;
+		uint16_t port;
 
 		if (! ascii_load_uint16(&port, buf))
 			return 0;
@@ -458,7 +458,7 @@ envelope_ascii_dump(enum envelope_field field, struct envelope *ep,
 }
 
 static int
-ascii_load_uint8(u_int8_t *dest, char *buf)
+ascii_load_uint8(uint8_t *dest, char *buf)
 {
 	const char *errstr;
 
@@ -469,7 +469,7 @@ ascii_load_uint8(u_int8_t *dest, char *buf)
 }
 
 static int
-ascii_load_uint16(u_int16_t *dest, char *buf)
+ascii_load_uint16(uint16_t *dest, char *buf)
 {
 	const char *errstr;
 
@@ -480,7 +480,7 @@ ascii_load_uint16(u_int16_t *dest, char *buf)
 }
 
 static int
-ascii_load_uint32(u_int32_t *dest, char *buf)
+ascii_load_uint32(uint32_t *dest, char *buf)
 {
 	const char *errstr;
 
@@ -502,7 +502,7 @@ ascii_load_time(time_t *dest, char *buf)
 }
 
 static int
-ascii_load_uint32_hex(u_int32_t *dest, char *buf)
+ascii_load_uint32_hex(uint32_t *dest, char *buf)
 {
 	uint64_t	u;
 	
@@ -515,7 +515,7 @@ ascii_load_uint32_hex(u_int32_t *dest, char *buf)
 }
 
 static int
-ascii_load_uint64_hex(u_int64_t *dest, char *buf)
+ascii_load_uint64_hex(uint64_t *dest, char *buf)
 {
 	char *endptr;
 	
@@ -617,7 +617,7 @@ ascii_load_flags(enum delivery_flags *dest, char *buf)
 }
 
 static int
-ascii_load_mta_relay_flags(u_int8_t *dest, char *buf)
+ascii_load_mta_relay_flags(uint8_t *dest, char *buf)
 {
 	char *flag;
 
@@ -635,13 +635,13 @@ ascii_load_mta_relay_flags(u_int8_t *dest, char *buf)
 }
 
 static int
-ascii_dump_uint8(u_int8_t src, char *dest, size_t len)
+ascii_dump_uint8(uint8_t src, char *dest, size_t len)
 {
 	return bsnprintf(dest, len, "%d", src);
 }
 
 static int
-ascii_dump_uint32(u_int32_t src, char *dest, size_t len)
+ascii_dump_uint32(uint32_t src, char *dest, size_t len)
 {
 	return bsnprintf(dest, len, "%d", src);
 }
@@ -653,13 +653,13 @@ ascii_dump_time(time_t src, char *dest, size_t len)
 }
 
 static int
-ascii_dump_uint32_hex(u_int32_t src, char *dest, size_t len)
+ascii_dump_uint32_hex(uint32_t src, char *dest, size_t len)
 {
 	return bsnprintf(dest, len, "%08" PRIx32, src);
 }
 
 static int
-ascii_dump_uint64_hex(u_int64_t src, char *dest, size_t len)
+ascii_dump_uint64_hex(uint64_t src, char *dest, size_t len)
 {
 	return bsnprintf(dest, len, "%016" PRIx64, src);
 }
@@ -724,13 +724,13 @@ ascii_dump_mailaddr(struct mailaddr *addr, char *dest, size_t len)
 }
 
 static int
-ascii_dump_mta_relay_port(u_int16_t port, char *buf, size_t len)
+ascii_dump_mta_relay_port(uint16_t port, char *buf, size_t len)
 {
 	return bsnprintf(buf, len, "%d", ntohs(port));
 }
 
 static int
-ascii_dump_mta_relay_flags(u_int8_t flags, char *buf, size_t len)
+ascii_dump_mta_relay_flags(uint8_t flags, char *buf, size_t len)
 {
 	size_t cpylen = 0;
 
diff --git a/usr.sbin/smtpd/filter_api.c b/usr.sbin/smtpd/filter_api.c
index b1015e5320d..789cb58e4b8 100644
--- a/usr.sbin/smtpd/filter_api.c
+++ b/usr.sbin/smtpd/filter_api.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filter_api.c,v 1.3 2012/06/16 16:16:09 chl Exp $	*/
+/*	$OpenBSD: filter_api.c,v 1.4 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -35,31 +35,31 @@ static struct filter_internals {
 	struct event	ev;
 	struct imsgbuf	ibuf;
 
-	enum filter_status (*connect_cb)(u_int64_t, struct filter_connect *, void *);
+	enum filter_status (*connect_cb)(uint64_t, struct filter_connect *, void *);
 	void *connect_cb_arg;
 
-	enum filter_status (*helo_cb)(u_int64_t, struct filter_helo *, void *);
+	enum filter_status (*helo_cb)(uint64_t, struct filter_helo *, void *);
 	void *helo_cb_arg;
 
-	enum filter_status (*ehlo_cb)(u_int64_t, struct filter_helo *, void *);
+	enum filter_status (*ehlo_cb)(uint64_t, struct filter_helo *, void *);
 	void *ehlo_cb_arg;
 
-	enum filter_status (*mail_cb)(u_int64_t, struct filter_mail *, void *);
+	enum filter_status (*mail_cb)(uint64_t, struct filter_mail *, void *);
 	void *mail_cb_arg;
 
-	enum filter_status (*rcpt_cb)(u_int64_t, struct filter_rcpt *, void *);
+	enum filter_status (*rcpt_cb)(uint64_t, struct filter_rcpt *, void *);
 	void *rcpt_cb_arg;
 
-	enum filter_status (*dataline_cb)(u_int64_t, struct filter_dataline *, void *);
+	enum filter_status (*dataline_cb)(uint64_t, struct filter_dataline *, void *);
 	void *dataline_cb_arg;
 
-	enum filter_status (*quit_cb)(u_int64_t, void *);
+	enum filter_status (*quit_cb)(uint64_t, void *);
 	void *quit_cb_arg;
 
-	enum filter_status (*close_cb)(u_int64_t, void *);
+	enum filter_status (*close_cb)(uint64_t, void *);
 	void *close_cb_arg;
 
-	enum filter_status (*rset_cb)(u_int64_t, void *);
+	enum filter_status (*rset_cb)(uint64_t, void *);
 	void *rset_cb_arg;
 
 } fi;
@@ -87,55 +87,55 @@ filter_loop(void)
 }
 
 void
-filter_register_connect_callback(enum filter_status (*cb)(u_int64_t, struct filter_connect *, void *), void *cb_arg)
+filter_register_connect_callback(enum filter_status (*cb)(uint64_t, struct filter_connect *, void *), void *cb_arg)
 {
 	filter_register_callback(FILTER_CONNECT, cb, cb_arg);
 }
 
 void
-filter_register_helo_callback(enum filter_status (*cb)(u_int64_t, struct filter_helo *, void *), void *cb_arg)
+filter_register_helo_callback(enum filter_status (*cb)(uint64_t, struct filter_helo *, void *), void *cb_arg)
 {
 	filter_register_callback(FILTER_HELO, cb, cb_arg);
 }
 
 void
-filter_register_ehlo_callback(enum filter_status (*cb)(u_int64_t, struct filter_helo *, void *), void *cb_arg)
+filter_register_ehlo_callback(enum filter_status (*cb)(uint64_t, struct filter_helo *, void *), void *cb_arg)
 {
 	filter_register_callback(FILTER_EHLO, cb, cb_arg);
 }
 
 void
-filter_register_mail_callback(enum filter_status (*cb)(u_int64_t, struct filter_mail *, void *), void *cb_arg)
+filter_register_mail_callback(enum filter_status (*cb)(uint64_t, struct filter_mail *, void *), void *cb_arg)
 {
 	filter_register_callback(FILTER_MAIL, cb, cb_arg);
 }
 
 void
-filter_register_rcpt_callback(enum filter_status (*cb)(u_int64_t, struct filter_rcpt *, void *), void *cb_arg)
+filter_register_rcpt_callback(enum filter_status (*cb)(uint64_t, struct filter_rcpt *, void *), void *cb_arg)
 {
 	filter_register_callback(FILTER_RCPT, cb, cb_arg);
 }
 
 void
-filter_register_dataline_callback(enum filter_status (*cb)(u_int64_t, struct filter_dataline *, void *), void *cb_arg)
+filter_register_dataline_callback(enum filter_status (*cb)(uint64_t, struct filter_dataline *, void *), void *cb_arg)
 {
 	filter_register_callback(FILTER_DATALINE, cb, cb_arg);
 }
 
 void
-filter_register_quit_callback(enum filter_status (*cb)(u_int64_t, void *), void *cb_arg)
+filter_register_quit_callback(enum filter_status (*cb)(uint64_t, void *), void *cb_arg)
 {
 	filter_register_callback(FILTER_QUIT, cb, cb_arg);
 }
 
 void
-filter_register_close_callback(enum filter_status (*cb)(u_int64_t, void *), void *cb_arg)
+filter_register_close_callback(enum filter_status (*cb)(uint64_t, void *), void *cb_arg)
 {
 	filter_register_callback(FILTER_CLOSE, cb, cb_arg);
 }
 
 void
-filter_register_rset_callback(enum filter_status (*cb)(u_int64_t, void *), void *cb_arg)
+filter_register_rset_callback(enum filter_status (*cb)(uint64_t, void *), void *cb_arg)
 {
 	filter_register_callback(FILTER_RSET, cb, cb_arg);
 }
diff --git a/usr.sbin/smtpd/filter_api.h b/usr.sbin/smtpd/filter_api.h
index 5adba6c17f9..77b08d16b76 100644
--- a/usr.sbin/smtpd/filter_api.h
+++ b/usr.sbin/smtpd/filter_api.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filter_api.h,v 1.2 2012/07/11 17:20:29 chl Exp $	*/
+/*	$OpenBSD: filter_api.h,v 1.3 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -85,10 +85,10 @@ union filter_union {
 };
 
 struct filter_msg {
-	u_int64_t		id;	 /* set by smtpd(8) */
-	u_int64_t		cl_id;	 /* set by smtpd(8) */
+	uint64_t		id;	 /* set by smtpd(8) */
+	uint64_t		cl_id;	 /* set by smtpd(8) */
 	int8_t       		code;
-	u_int8_t		version;
+	uint8_t			version;
 	enum filter_type	type;
 	union filter_union	u;
 };
@@ -97,13 +97,13 @@ struct filter_msg {
 void filter_init(void);
 void filter_loop(void);
 
-void filter_register_connect_callback(enum filter_status (*)(u_int64_t, struct filter_connect *, void *), void *);
-void filter_register_helo_callback(enum filter_status (*)(u_int64_t, struct filter_helo *, void *), void *);
-void filter_register_ehlo_callback(enum filter_status (*)(u_int64_t, struct filter_helo *, void *), void *);
-void filter_register_mail_callback(enum filter_status (*)(u_int64_t, struct filter_mail *, void *), void *);
-void filter_register_rcpt_callback(enum filter_status (*)(u_int64_t, struct filter_rcpt *, void *), void *);
-void filter_register_dataline_callback(enum filter_status (*)(u_int64_t, struct filter_dataline *, void *), void *);
-void filter_register_quit_callback(enum filter_status (*)(u_int64_t, void *), void *);
-void filter_register_close_callback(enum filter_status (*)(u_int64_t, void *), void *);
-void filter_register_rset_callback(enum filter_status (*)(u_int64_t, void *), void *);
+void filter_register_connect_callback(enum filter_status (*)(uint64_t, struct filter_connect *, void *), void *);
+void filter_register_helo_callback(enum filter_status (*)(uint64_t, struct filter_helo *, void *), void *);
+void filter_register_ehlo_callback(enum filter_status (*)(uint64_t, struct filter_helo *, void *), void *);
+void filter_register_mail_callback(enum filter_status (*)(uint64_t, struct filter_mail *, void *), void *);
+void filter_register_rcpt_callback(enum filter_status (*)(uint64_t, struct filter_rcpt *, void *), void *);
+void filter_register_dataline_callback(enum filter_status (*)(uint64_t, struct filter_dataline *, void *), void *);
+void filter_register_quit_callback(enum filter_status (*)(uint64_t, void *), void *);
+void filter_register_close_callback(enum filter_status (*)(uint64_t, void *), void *);
+void filter_register_rset_callback(enum filter_status (*)(uint64_t, void *), void *);
 
diff --git a/usr.sbin/smtpd/lka_session.c b/usr.sbin/smtpd/lka_session.c
index c85a8572e1d..3037c15cbce 100644
--- a/usr.sbin/smtpd/lka_session.c
+++ b/usr.sbin/smtpd/lka_session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lka_session.c,v 1.20 2012/08/09 09:48:02 eric Exp $	*/
+/*	$OpenBSD: lka_session.c,v 1.21 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -43,8 +43,8 @@ void lka_session(struct submit_status *);
 void lka_session_forward_reply(struct forward_req *, int);
 
 struct lka_session *lka_session_init(struct submit_status *);
-struct lka_session *lka_session_find(u_int64_t);
-struct lka_session *lka_session_xfind(u_int64_t);
+struct lka_session *lka_session_find(uint64_t);
+struct lka_session *lka_session_xfind(uint64_t);
 void lka_session_fail(struct lka_session *);
 void lka_session_destroy(struct lka_session *);
 void lka_session_pickup(struct lka_session *, struct envelope *);
@@ -258,7 +258,7 @@ int
 lka_session_resume(struct lka_session *lks, struct envelope *ep)
 {
 	struct expandnode *xn;
-        u_int8_t done = 1;
+        uint8_t done = 1;
 
 	RB_FOREACH(xn, expandtree, &lks->expandtree) {
 
@@ -329,7 +329,7 @@ done:
 }
 
 struct lka_session *
-lka_session_find(u_int64_t id)
+lka_session_find(uint64_t id)
 {
 	struct lka_session key;
 
@@ -338,7 +338,7 @@ lka_session_find(u_int64_t id)
 }
 
 struct lka_session *
-lka_session_xfind(u_int64_t id)
+lka_session_xfind(uint64_t id)
 {
 	struct lka_session *lks;
 
@@ -662,7 +662,7 @@ int
 lka_session_cmp(struct lka_session *s1, struct lka_session *s2)
 {
 	/*
-	 * do not return u_int64_t's
+	 * do not return uint64_t's
 	 */
 	if (s1->id < s2->id)
 		return -1;
diff --git a/usr.sbin/smtpd/makemap.c b/usr.sbin/smtpd/makemap.c
index 36126b25a68..73dee2a5e78 100644
--- a/usr.sbin/smtpd/makemap.c
+++ b/usr.sbin/smtpd/makemap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: makemap.c,v 1.33 2012/07/29 17:21:43 gilles Exp $	*/
+/*	$OpenBSD: makemap.c,v 1.34 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -75,13 +75,13 @@ enum output_type {
  * Stub functions so that makemap compiles using minimum object files.
  */
 void
-purge_config(u_int8_t what)
+purge_config(uint8_t what)
 {
 	bzero(env, sizeof(struct smtpd));
 }
 
 int
-ssl_load_certfile(const char *name, u_int8_t flags)
+ssl_load_certfile(const char *name, uint8_t flags)
 {
 	return (0);
 }
diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index df5e20fca29..126db565253 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mda.c,v 1.68 2012/08/09 09:48:02 eric Exp $	*/
+/*	$OpenBSD: mda.c,v 1.69 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -45,9 +45,9 @@ static void mda_shutdown(void);
 static void mda_sig_handler(int, short, void *);
 static void mda_store(struct mda_session *);
 static void mda_store_event(int, short, void *);
-static struct mda_session *mda_lookup(u_int32_t);
+static struct mda_session *mda_lookup(uint32_t);
 
-u_int32_t mda_id;
+uint32_t mda_id;
 
 static void
 mda_imsg(struct imsgev *iev, struct imsg *imsg)
@@ -58,7 +58,7 @@ mda_imsg(struct imsgev *iev, struct imsg *imsg)
 	struct delivery_mda	*d_mda;
 	struct mailaddr		*maddr;
 	struct envelope		*ep;
-	u_int16_t		 msg;
+	uint16_t		 msg;
 
 	log_imsg(PROC_MDA, iev->proc, imsg);
 
@@ -396,7 +396,7 @@ mda_store_event(int fd, short event, void *p)
 }
 
 static struct mda_session *
-mda_lookup(u_int32_t id)
+mda_lookup(uint32_t id)
 {
 	struct mda_session *s;
 
diff --git a/usr.sbin/smtpd/mfa_session.c b/usr.sbin/smtpd/mfa_session.c
index 9a9c5609325..a84d58c84d3 100644
--- a/usr.sbin/smtpd/mfa_session.c
+++ b/usr.sbin/smtpd/mfa_session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mfa_session.c,v 1.7 2012/01/18 13:41:54 chl Exp $	*/
+/*	$OpenBSD: mfa_session.c,v 1.8 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -41,8 +41,8 @@
 
 void mfa_session(struct submit_status *, enum session_state);
 struct mfa_session *mfa_session_init(struct submit_status *, enum session_state);
-struct mfa_session *mfa_session_find(u_int64_t);
-struct mfa_session *mfa_session_xfind(u_int64_t);
+struct mfa_session *mfa_session_find(uint64_t);
+struct mfa_session *mfa_session_xfind(uint64_t);
 int mfa_session_proceed(struct mfa_session *);
 void mfa_session_pickup(struct mfa_session *);
 void mfa_session_fail(struct mfa_session *);
@@ -234,7 +234,7 @@ mfa_session_done(struct mfa_session *ms)
 }
 
 struct mfa_session *
-mfa_session_find(u_int64_t id)
+mfa_session_find(uint64_t id)
 {
 	struct mfa_session key;
 
@@ -243,7 +243,7 @@ mfa_session_find(u_int64_t id)
 }
 
 struct mfa_session *
-mfa_session_xfind(u_int64_t id)
+mfa_session_xfind(uint64_t id)
 {
 	struct mfa_session *ms;
 
@@ -346,7 +346,7 @@ int
 mfa_session_cmp(struct mfa_session *s1, struct mfa_session *s2)
 {
 	/*
-	 * do not return u_int64_t's
+	 * do not return uint64_t's
 	 */
 	if (s1->id < s2->id)
 		return -1;
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index 454ea66ae60..1a2e6c11165 100644
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.89 2012/07/08 15:48:00 gilles Exp $	*/
+/*	$OpenBSD: parse.y,v 1.90 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -97,11 +97,11 @@ struct mapel_list	*contents = NULL;
 struct listener	*host_v4(const char *, in_port_t);
 struct listener	*host_v6(const char *, in_port_t);
 int		 host_dns(const char *, const char *, const char *,
-		    struct listenerlist *, int, in_port_t, u_int8_t);
+		    struct listenerlist *, int, in_port_t, uint8_t);
 int		 host(const char *, const char *, const char *,
-		    struct listenerlist *, int, in_port_t, u_int8_t);
+		    struct listenerlist *, int, in_port_t, uint8_t);
 int		 interface(const char *, const char *, const char *,
-		    struct listenerlist *, int, in_port_t, u_int8_t);
+		    struct listenerlist *, int, in_port_t, uint8_t);
 void		 set_localaddrs(void);
 int		 delaytonum(char *);
 int		 is_if_in_group(const char *, const char *);
@@ -322,7 +322,7 @@ main		: QUEUE INTERVAL interval	{
 		| LISTEN ON STRING port ssl certname auth tag {
 			char		*cert;
 			char		*tag;
-			u_int8_t	 flags;
+			uint8_t		 flags;
 
 			if ($5 == F_SSL) {
 				yyerror("syntax error");
@@ -1687,7 +1687,7 @@ host_v6(const char *s, in_port_t port)
 
 int
 host_dns(const char *s, const char *tag, const char *cert,
-    struct listenerlist *al, int max, in_port_t port, u_int8_t flags)
+    struct listenerlist *al, int max, in_port_t port, uint8_t flags)
 {
 	struct addrinfo		 hints, *res0, *res;
 	int			 error, cnt = 0;
@@ -1751,7 +1751,7 @@ host_dns(const char *s, const char *tag, const char *cert,
 
 int
 host(const char *s, const char *tag, const char *cert, struct listenerlist *al,
-    int max, in_port_t port, u_int8_t flags)
+    int max, in_port_t port, uint8_t flags)
 {
 	struct listener *h;
 
@@ -1780,7 +1780,7 @@ host(const char *s, const char *tag, const char *cert, struct listenerlist *al,
 
 int
 interface(const char *s, const char *tag, const char *cert,
-    struct listenerlist *al, int max, in_port_t port, u_int8_t flags)
+    struct listenerlist *al, int max, in_port_t port, uint8_t flags)
 {
 	struct ifaddrs *ifap, *p;
 	struct sockaddr_in	*sain;
diff --git a/usr.sbin/smtpd/parser.c b/usr.sbin/smtpd/parser.c
index 7bb6fa97c4e..53444e913de 100644
--- a/usr.sbin/smtpd/parser.c
+++ b/usr.sbin/smtpd/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.25 2012/05/13 09:18:52 nicm Exp $	*/
+/*	$OpenBSD: parser.c,v 1.26 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -146,7 +146,7 @@ const struct token *
 match_token(const char *word, const struct token table[],
     struct parse_result *res)
 {
-	u_int			 i, match;
+	uint			 i, match;
 	const struct token	*t = NULL;
 
 	match = 0;
diff --git a/usr.sbin/smtpd/queue_backend.c b/usr.sbin/smtpd/queue_backend.c
index bfb5587d0d9..a81ef220936 100644
--- a/usr.sbin/smtpd/queue_backend.c
+++ b/usr.sbin/smtpd/queue_backend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_backend.c,v 1.28 2012/07/10 23:21:34 chl Exp $	*/
+/*	$OpenBSD: queue_backend.c,v 1.29 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -44,7 +44,7 @@ static const char* envelope_validate(struct envelope *, uint64_t);
 extern struct queue_backend	queue_backend_fs;
 
 int
-queue_message_incoming_path(u_int32_t msgid, char *buf, size_t len)
+queue_message_incoming_path(uint32_t msgid, char *buf, size_t len)
 {
 	return bsnprintf(buf, len, "%s/%08x",
 	    PATH_INCOMING,
@@ -52,7 +52,7 @@ queue_message_incoming_path(u_int32_t msgid, char *buf, size_t len)
 }
 
 int
-queue_envelope_incoming_path(u_int64_t evpid, char *buf, size_t len)
+queue_envelope_incoming_path(uint64_t evpid, char *buf, size_t len)
 {
 	return bsnprintf(buf, len, "%s/%08x%s/%016" PRIx64,
 	    PATH_INCOMING,
@@ -62,7 +62,7 @@ queue_envelope_incoming_path(u_int64_t evpid, char *buf, size_t len)
 }
 
 int
-queue_message_incoming_delete(u_int32_t msgid)
+queue_message_incoming_delete(uint32_t msgid)
 {
 	char rootdir[MAXPATHLEN];
 
@@ -85,37 +85,37 @@ queue_backend_lookup(const char *name)
 }
 
 int
-queue_message_create(u_int32_t *msgid)
+queue_message_create(uint32_t *msgid)
 {
 	return env->sc_queue->message(QOP_CREATE, msgid);
 }
 
 int
-queue_message_delete(u_int32_t msgid)
+queue_message_delete(uint32_t msgid)
 {
 	return env->sc_queue->message(QOP_DELETE, &msgid);
 }
 
 int
-queue_message_commit(u_int32_t msgid)
+queue_message_commit(uint32_t msgid)
 {
 	return env->sc_queue->message(QOP_COMMIT, &msgid);
 }
 
 int
-queue_message_corrupt(u_int32_t msgid)
+queue_message_corrupt(uint32_t msgid)
 {
 	return env->sc_queue->message(QOP_CORRUPT, &msgid);
 }
 
 int
-queue_message_fd_r(u_int32_t msgid)
+queue_message_fd_r(uint32_t msgid)
 {
 	return env->sc_queue->message(QOP_FD_R, &msgid);
 }
 
 int
-queue_message_fd_rw(u_int32_t msgid)
+queue_message_fd_rw(uint32_t msgid)
 {
 	char msgpath[MAXPATHLEN];
 
@@ -146,7 +146,7 @@ queue_envelope_delete(struct envelope *ep)
 }
 
 int
-queue_envelope_load(u_int64_t evpid, struct envelope *ep)
+queue_envelope_load(uint64_t evpid, struct envelope *ep)
 {
 	const char	*e;
 
@@ -168,13 +168,13 @@ queue_envelope_update(struct envelope *ep)
 }
 
 void *
-qwalk_new(u_int32_t msgid)
+qwalk_new(uint32_t msgid)
 {
 	return env->sc_queue->qwalk_new(msgid);
 }
 
 int
-qwalk(void *hdl, u_int64_t *evpid)
+qwalk(void *hdl, uint64_t *evpid)
 {
 	return env->sc_queue->qwalk(hdl, evpid);
 }
@@ -185,10 +185,10 @@ qwalk_close(void *hdl)
 	return env->sc_queue->qwalk_close(hdl);
 }
 
-u_int32_t
+uint32_t
 queue_generate_msgid(void)
 {
-	u_int32_t msgid;
+	uint32_t msgid;
 
 	while((msgid = arc4random_uniform(0xffffffff)) == 0)
 		;
@@ -196,11 +196,11 @@ queue_generate_msgid(void)
 	return msgid;
 }
 
-u_int64_t
-queue_generate_evpid(u_int32_t msgid)
+uint64_t
+queue_generate_evpid(uint32_t msgid)
 {
-	u_int32_t rnd;
-	u_int64_t evpid;
+	uint32_t rnd;
+	uint64_t evpid;
 
 	while((rnd = arc4random_uniform(0xffffffff)) == 0)
 		;
diff --git a/usr.sbin/smtpd/queue_fsqueue.c b/usr.sbin/smtpd/queue_fsqueue.c
index 5e56ae6de6e..2e95253ab5b 100644
--- a/usr.sbin/smtpd/queue_fsqueue.c
+++ b/usr.sbin/smtpd/queue_fsqueue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_fsqueue.c,v 1.48 2012/08/19 10:32:32 chl Exp $	*/
+/*	$OpenBSD: queue_fsqueue.c,v 1.49 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -46,22 +46,22 @@ static int	fsqueue_envelope_load(struct envelope *);
 static int	fsqueue_envelope_update(struct envelope *);
 static int	fsqueue_envelope_delete(struct envelope *);
 
-static int	fsqueue_message_create(u_int32_t *);
-static int	fsqueue_message_commit(u_int32_t);
-static int	fsqueue_message_fd_r(u_int32_t);
-static int	fsqueue_message_delete(u_int32_t);
-static int	fsqueue_message_corrupt(u_int32_t);
+static int	fsqueue_message_create(uint32_t *);
+static int	fsqueue_message_commit(uint32_t);
+static int	fsqueue_message_fd_r(uint32_t);
+static int	fsqueue_message_delete(uint32_t);
+static int	fsqueue_message_corrupt(uint32_t);
 
 static int	fsqueue_message_path(uint32_t, char *, size_t);
-static int	fsqueue_envelope_path(u_int64_t, char *, size_t);
+static int	fsqueue_envelope_path(uint64_t, char *, size_t);
 static int	fsqueue_envelope_dump_atomic(char *, struct envelope *);
 
 static int	fsqueue_init(int);
-static int	fsqueue_message(enum queue_op, u_int32_t *);
+static int	fsqueue_message(enum queue_op, uint32_t *);
 static int	fsqueue_envelope(enum queue_op , struct envelope *);
 
-static void    *fsqueue_qwalk_new(u_int32_t);
-static int	fsqueue_qwalk(void *, u_int64_t *);
+static void    *fsqueue_qwalk_new(uint32_t);
+static int	fsqueue_qwalk(void *, uint64_t *);
 static void	fsqueue_qwalk_close(void *);
 
 #define PATH_QUEUE		"/queue"
@@ -168,7 +168,7 @@ static int
 fsqueue_envelope_create(struct envelope *ep)
 {
 	char		evpname[MAXPATHLEN];
-	u_int64_t	evpid;
+	uint64_t	evpid;
 	struct stat	sb;
 
 again:
@@ -239,7 +239,7 @@ fsqueue_envelope_delete(struct envelope *ep)
 }
 
 static int
-fsqueue_message_create(u_int32_t *msgid)
+fsqueue_message_create(uint32_t *msgid)
 {
 	char rootdir[MAXPATHLEN];
 	char evpdir[MAXPATHLEN];
@@ -281,7 +281,7 @@ again:
 }
 
 static int
-fsqueue_message_commit(u_int32_t msgid)
+fsqueue_message_commit(uint32_t msgid)
 {
 	char incomingdir[MAXPATHLEN];
 	char queuedir[MAXPATHLEN];
@@ -309,7 +309,7 @@ fsqueue_message_commit(u_int32_t msgid)
 }
 
 static int
-fsqueue_message_fd_r(u_int32_t msgid)
+fsqueue_message_fd_r(uint32_t msgid)
 {
 	int fd;
 	char path[MAXPATHLEN];
@@ -324,7 +324,7 @@ fsqueue_message_fd_r(u_int32_t msgid)
 }
 
 static int
-fsqueue_message_delete(u_int32_t msgid)
+fsqueue_message_delete(uint32_t msgid)
 {
 	char rootdir[MAXPATHLEN];
 
@@ -338,7 +338,7 @@ fsqueue_message_delete(u_int32_t msgid)
 }
 
 static int
-fsqueue_message_corrupt(u_int32_t msgid)
+fsqueue_message_corrupt(uint32_t msgid)
 {
 	struct stat sb;
 	char rootdir[MAXPATHLEN];
@@ -388,7 +388,7 @@ fsqueue_init(int server)
 }
 
 static int
-fsqueue_message(enum queue_op qop, u_int32_t *msgid)
+fsqueue_message(enum queue_op qop, uint32_t *msgid)
 {
         switch (qop) {
         case QOP_CREATE:
@@ -446,13 +446,13 @@ struct qwalk {
 	int	(*filefn)(struct qwalk *, char *);
 	int	  bucket;
 	int	  level;
-	u_int32_t msgid;
+	uint32_t msgid;
 };
 
 static int walk_queue(struct qwalk *, char *);
 
 static void *
-fsqueue_qwalk_new(u_int32_t msgid)
+fsqueue_qwalk_new(uint32_t msgid)
 {
 	struct qwalk *q;
 
@@ -482,7 +482,7 @@ fsqueue_qwalk_new(u_int32_t msgid)
 }
 
 static int
-fsqueue_qwalk(void *hdl, u_int64_t *evpid)
+fsqueue_qwalk(void *hdl, uint64_t *evpid)
 {
 	struct qwalk *q = hdl;
 	struct dirent	*dp;
@@ -513,7 +513,7 @@ again:
 		char *endptr;
 
 		errno = 0;
-		*evpid = (u_int64_t)strtoull(dp->d_name, &endptr, 16);
+		*evpid = (uint64_t)strtoull(dp->d_name, &endptr, 16);
 		if (q->path[0] == '\0' || *endptr != '\0')
 			goto again;
 		if (errno == ERANGE && *evpid == ULLONG_MAX)
diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c
index c4d7ab3aa58..83e6f1b0795 100644
--- a/usr.sbin/smtpd/smtp.c
+++ b/usr.sbin/smtpd/smtp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtp.c,v 1.104 2012/08/18 18:18:23 gilles Exp $	*/
+/*	$OpenBSD: smtp.c,v 1.105 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -47,7 +47,7 @@ static void smtp_pause(void);
 static int smtp_enqueue(uid_t *);
 static void smtp_accept(int, short, void *);
 static struct session *smtp_new(struct listener *);
-static struct session *session_lookup(u_int64_t);
+static struct session *session_lookup(uint64_t);
 
 static size_t sessions;
 
@@ -109,7 +109,7 @@ smtp_imsg(struct imsgev *iev, struct imsg *imsg)
 			s = session_lookup(ss->id);
 			if (s == NULL)
 				return;
-			s->s_msg.id = ((u_int64_t)ss->u.msgid) << 32;
+			s->s_msg.id = ((uint64_t)ss->u.msgid) << 32;
 			session_pickup(s, ss);
 			return;
 
@@ -554,7 +554,7 @@ smtp_destroy(struct session *session)
  * Helper function for handling IMSG replies.
  */
 static struct session *
-session_lookup(u_int64_t id)
+session_lookup(uint64_t id)
 {
 	struct session	 key;
 	struct session	*s;
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index d173fef7599..24e8e993117 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.165 2012/08/18 18:18:23 gilles Exp $	*/
+/*	$OpenBSD: smtp_session.c,v 1.166 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -76,7 +76,7 @@ static void session_command(struct session *, char *);
 static void session_respond_delayed(int, short, void *);
 static int session_set_mailaddr(struct mailaddr *, char *);
 static void session_imsg(struct session *, enum smtp_proc_type,
-    enum imsg_type, u_int32_t, pid_t, int, void *, u_int16_t);
+    enum imsg_type, uint32_t, pid_t, int, void *, uint16_t);
 
 static void session_enter_state(struct session *, int);
 
@@ -1041,7 +1041,7 @@ int
 session_cmp(struct session *s1, struct session *s2)
 {
 	/*
-	 * do not return u_int64_t's
+	 * do not return uint64_t's
 	 */
 	if (s1->s_id < s2->s_id)
 		return (-1);
@@ -1149,7 +1149,7 @@ session_respond_delayed(int fd, short event, void *p)
  */
 static void
 session_imsg(struct session *s, enum smtp_proc_type proc, enum imsg_type type,
-    u_int32_t peerid, pid_t pid, int fd, void *data, u_int16_t datalen)
+    uint32_t peerid, pid_t pid, int fd, void *data, uint16_t datalen)
 {
 	/*
 	 * Each outgoing IMSG has a response IMSG associated that must be
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index e8fb5e80f78..194db853cc4 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpctl.c,v 1.86 2012/08/18 18:18:23 gilles Exp $	*/
+/*	$OpenBSD: smtpctl.c,v 1.87 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -48,7 +48,7 @@ static int show_command_output(struct imsg *);
 static void show_stats_output(void);
 static void show_queue(int);
 static void show_envelope(struct envelope *, int);
-static void getflag(u_int *, int, char *, char *, size_t);
+static void getflag(uint *, int, char *, char *, size_t);
 
 int proctype;
 struct imsgbuf	*ibuf;
@@ -162,7 +162,7 @@ connected:
 
 	case SCHEDULE:
 	case REMOVE: {
-		u_int64_t ulval;
+		uint64_t ulval;
 		char *ep;
 
 		errno = 0;
@@ -184,7 +184,7 @@ connected:
 	}
 
 	case SCHEDULE_ALL: {
-		u_int64_t ulval = 0;
+		uint64_t ulval = 0;
 
 		imsg_compose(ibuf, IMSG_SCHEDULER_SCHEDULE, 0, 0, -1, &ulval,
 		    sizeof(ulval));
@@ -356,7 +356,7 @@ show_queue(int flags)
 {
 	struct qwalk	*q;
 	struct envelope	 envelope;
-	u_int64_t	 evpid;
+	uint64_t	 evpid;
 
 	log_init(1);
 
@@ -429,7 +429,7 @@ show_envelope(struct envelope *e, int flags)
 }
 
 static void
-getflag(u_int *bitmap, int bit, char *bitstr, char *buf, size_t len)
+getflag(uint *bitmap, int bit, char *bitstr, char *buf, size_t len)
 {
 	if (*bitmap & bit) {
 		*bitmap &= ~bit;
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 0add71fc6e0..8b7ba9dc418 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.c,v 1.159 2012/08/19 08:47:41 chl Exp $	*/
+/*	$OpenBSD: smtpd.c,v 1.160 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -54,7 +54,7 @@ static void parent_send_config_listeners(void);
 static void parent_send_config_client_certs(void);
 static void parent_send_config_ruleset(int);
 static void parent_sig_handler(int, short, void *);
-static void forkmda(struct imsgev *, u_int32_t, struct deliver *);
+static void forkmda(struct imsgev *, uint32_t, struct deliver *);
 static int parent_forward_open(char *);
 static void fork_peers(void);
 static struct child *child_lookup(pid_t);
@@ -731,8 +731,8 @@ imsg_event_add(struct imsgev *iev)
 }
 
 void
-imsg_compose_event(struct imsgev *iev, u_int16_t type, u_int32_t peerid,
-    pid_t pid, int fd, void *data, u_int16_t datalen)
+imsg_compose_event(struct imsgev *iev, uint16_t type, uint32_t peerid,
+    pid_t pid, int fd, void *data, uint16_t datalen)
 {
 	if (imsg_compose(&iev->ibuf, type, peerid, pid, fd, data, datalen) == -1)
 		fatal("imsg_compose_event");
@@ -788,7 +788,7 @@ purge_task(int fd, short ev, void *arg)
 }
 
 static void
-forkmda(struct imsgev *iev, u_int32_t id,
+forkmda(struct imsgev *iev, uint32_t id,
     struct deliver *deliver)
 {
 	char		 ebuf[128], sfn[32];
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index e0d46b6d8e2..76b22373676 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.h,v 1.325 2012/08/19 10:32:32 chl Exp $	*/
+/*	$OpenBSD: smtpd.h,v 1.326 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -92,7 +92,7 @@
 #define ROUTE_AUTH		0x04
 #define ROUTE_MX		0x08
 
-typedef u_int32_t	objid_t;
+typedef uint32_t	objid_t;
 
 struct netaddr {
 	struct sockaddr_storage ss;
@@ -100,9 +100,9 @@ struct netaddr {
 };
 
 struct relayhost {
-	u_int8_t flags;
+	uint8_t flags;
 	char hostname[MAXHOSTNAMELEN];
-	u_int16_t port;
+	uint16_t port;
 	char cert[PATH_MAX];
 	char authmap[MAX_PATH_SIZE];
 };
@@ -203,7 +203,7 @@ struct imsgev {
 
 struct ctl_conn {
 	TAILQ_ENTRY(ctl_conn)	 entry;
-	u_int8_t		 flags;
+	uint8_t			 flags;
 #define CTL_CONN_NOTIFY		 0x01
 	struct imsgev		 iev;
 };
@@ -392,11 +392,11 @@ struct envelope {
 	char				tag[MAX_TAG_SIZE];
 	struct rule			rule;
 
-	u_int64_t			session_id;
-	u_int64_t			batch_id;
+	uint64_t			session_id;
+	uint64_t			batch_id;
 
-	u_int32_t			version;
-	u_int64_t			id;
+	uint32_t			version;
+	uint64_t			id;
 	enum delivery_type		type;
 
 	char				helo[MAXHOSTNAMELEN];
@@ -416,7 +416,7 @@ struct envelope {
 	time_t				 creation;
 	time_t				 lasttry;
 	time_t				 expire;
-	u_int8_t			 retry;
+	uint8_t				 retry;
 	enum delivery_flags		 flags;
 };
 TAILQ_HEAD(deliverylist, envelope);
@@ -462,7 +462,7 @@ struct child {
 	enum child_type		 type;
 	enum smtp_proc_type	 title;
 	int			 mda_out;
-	u_int32_t		 mda_id;
+	uint32_t		 mda_id;
 	char			*path;
 };
 
@@ -503,11 +503,11 @@ struct ssl {
 	off_t			 ssl_key_len;
 	char			*ssl_dhparams;
 	off_t			 ssl_dhparams_len;
-	u_int8_t		 flags;
+	uint8_t			 flags;
 };
 
 struct listener {
-	u_int8_t		 flags;
+	uint8_t			 flags;
 	int			 fd;
 	struct sockaddr_storage	 ss;
 	in_port_t		 port;
@@ -521,7 +521,7 @@ struct listener {
 };
 
 struct auth {
-	u_int64_t	 id;
+	uint64_t	 id;
 	char		 user[MAXLOGNAME];
 	char		 pass[MAX_LINE_SIZE + 1];
 	int		 success;
@@ -538,7 +538,7 @@ enum session_flags {
 
 struct session {
 	SPLAY_ENTRY(session)		 s_nodes;
-	u_int64_t			 s_id;
+	uint64_t			 s_id;
 
 	struct iobuf			 s_iobuf;
 	struct io			 s_io;
@@ -569,7 +569,7 @@ struct smtpd {
 
 #define SMTPD_OPT_VERBOSE			 0x00000001
 #define SMTPD_OPT_NOACTION			 0x00000002
-	u_int32_t				 sc_opts;
+	uint32_t				 sc_opts;
 #define SMTPD_CONFIGURING			 0x00000001
 #define SMTPD_EXITING				 0x00000002
 #define SMTPD_MDA_PAUSED		       	 0x00000004
@@ -578,10 +578,10 @@ struct smtpd {
 #define SMTPD_MDA_BUSY			       	 0x00000020
 #define SMTPD_MTA_BUSY			       	 0x00000040
 #define SMTPD_BOUNCE_BUSY      		       	 0x00000080
-	u_int32_t				 sc_flags;
+	uint32_t				 sc_flags;
 	struct timeval				 sc_qintval;
 	int					 sc_qexpire;
-	u_int32_t				 sc_maxconn;
+	uint32_t				 sc_maxconn;
 	struct event				 sc_ev;
 	int					 *sc_pipes[PROC_COUNT]
 							[PROC_COUNT];
@@ -609,7 +609,7 @@ struct smtpd {
 	SPLAY_HEAD(mfatree, mfa_session)	 mfa_sessions;
 	LIST_HEAD(mdalist, mda_session)		 mda_sessions;
 
-	u_int64_t				 filtermask;
+	uint64_t				 filtermask;
 };
 
 #define	TRACE_VERBOSE	0x0001
@@ -623,12 +623,12 @@ struct smtpd {
 
 
 struct submit_status {
-	u_int64_t			 id;
+	uint64_t			 id;
 	int				 code;
 	union submit_path {
 		struct mailaddr		 maddr;
-		u_int32_t		 msgid;
-		u_int64_t		 evpid;
+		uint32_t		 msgid;
+		uint64_t		 evpid;
 		char			 errormsg[MAX_LINE_SIZE + 1];
 		char			 dataline[MAX_LINE_SIZE + 1];
 	}				 u;
@@ -638,8 +638,8 @@ struct submit_status {
 };
 
 struct forward_req {
-	u_int64_t			 id;
-	u_int8_t			 status;
+	uint64_t			 id;
+	uint8_t				 status;
 	char				 as_user[MAXLOGNAME];
 	struct envelope			 envelope;
 };
@@ -653,7 +653,7 @@ enum dns_status {
 };
 
 struct dns {
-	u_int64_t		 id;
+	uint64_t		 id;
 	char			 host[MAXHOSTNAMELEN];
 	int			 port;
 	int			 error;
@@ -664,7 +664,7 @@ struct dns {
 };
 
 struct secret {
-	u_int64_t		 id;
+	uint64_t		 id;
 	char			 mapname[MAX_PATH_SIZE];
 	char			 host[MAXHOSTNAMELEN];
 	char			 secret[MAX_LINE_SIZE];
@@ -675,7 +675,7 @@ struct mda_session {
 	struct envelope		 msg;
 	struct msgbuf		 w;
 	struct event		 ev;
-	u_int32_t		 id;
+	uint32_t		 id;
 	FILE			*datafp;
 };
 
@@ -687,7 +687,7 @@ struct deliver {
 };
 
 struct rulematch {
-	u_int64_t		 id;
+	uint64_t		 id;
 	struct submit_status	 ss;
 };
 
@@ -697,13 +697,13 @@ enum lka_session_flags {
 
 struct lka_session {
 	SPLAY_ENTRY(lka_session)	 nodes;
-	u_int64_t			 id;
+	uint64_t			 id;
 
 	struct deliverylist		 deliverylist;
 	struct expandtree		 expandtree;
 
-	u_int8_t			 iterations;
-	u_int32_t			 pending;
+	uint8_t				 iterations;
+	uint32_t			 pending;
 	enum lka_session_flags		 flags;
 	struct submit_status		 ss;
 };
@@ -719,7 +719,7 @@ struct filter {
 
 struct mfa_session {
 	SPLAY_ENTRY(mfa_session)	 nodes;
-	u_int64_t			 id;
+	uint64_t			 id;
 
 	enum session_state		 state;
 	struct submit_status		 ss;
@@ -798,11 +798,11 @@ enum queue_op {
 
 struct queue_backend {
 	int (*init)(int);
-	int (*message)(enum queue_op, u_int32_t *);
+	int (*message)(enum queue_op, uint32_t *);
 	int (*envelope)(enum queue_op, struct envelope *);
 
-	void *(*qwalk_new)(u_int32_t);
-	int   (*qwalk)(void *, u_int64_t *);
+	void *(*qwalk_new)(uint32_t);
+	int   (*qwalk)(void *, uint64_t *);
 	void  (*qwalk_close)(void *);
 };
 
@@ -844,14 +844,14 @@ struct delivery_backend {
 };
 
 struct scheduler_info {
-	u_int64_t		evpid;
+	uint64_t		evpid;
 	char			destination[MAXHOSTNAMELEN];
 
 	enum delivery_type	type;
 	time_t			creation;
 	time_t			lasttry;
 	time_t			expire;
-	u_int8_t		retry;
+	uint8_t			retry;
 };
 
 struct id_list {
@@ -877,16 +877,16 @@ struct scheduler_backend {
 	void	(*init)(void);
 
 	void	(*insert)(struct scheduler_info *);
-	void	(*commit)(u_int32_t);
-	void	(*rollback)(u_int32_t);
+	void	(*commit)(uint32_t);
+	void	(*rollback)(uint32_t);
 
 	void	(*update)(struct scheduler_info *);
-	void	(*delete)(u_int64_t);
+	void	(*delete)(uint64_t);
 
 	void	(*batch)(int, time_t, struct scheduler_batch *);
 
-	void	(*schedule)(u_int64_t);
-	void	(*remove)(u_int64_t);
+	void	(*schedule)(uint64_t);
+	void	(*remove)(uint64_t);
 };
 
 
@@ -935,12 +935,12 @@ void bounce_run(uint64_t, int);
 #define PURGE_RULES		0x04
 #define PURGE_SSL		0x08
 #define PURGE_EVERYTHING	0xff
-void purge_config(u_int8_t);
+void purge_config(uint8_t);
 void unconfigure(void);
 void configure(void);
 void init_pipes(void);
-void config_pipes(struct peer *, u_int);
-void config_peers(struct peer *, u_int);
+void config_pipes(struct peer *, uint);
+void config_peers(struct peer *, uint);
 
 
 /* control.c */
@@ -955,9 +955,9 @@ struct delivery_backend *delivery_backend_lookup(enum action_type);
 
 
 /* dns.c */
-void dns_query_host(char *, int, u_int64_t);
-void dns_query_mx(char *, int, u_int64_t);
-void dns_query_ptr(struct sockaddr_storage *, u_int64_t);
+void dns_query_host(char *, int, uint64_t);
+void dns_query_mx(char *, int, uint64_t);
+void dns_query_ptr(struct sockaddr_storage *, uint64_t);
 void dns_async(struct imsgev *, int, struct dns *);
 
 
@@ -1039,24 +1039,24 @@ pid_t queue(void);
 
 
 /* queue_backend.c */
-u_int32_t queue_generate_msgid(void);
-u_int64_t queue_generate_evpid(u_int32_t msgid);
+uint32_t queue_generate_msgid(void);
+uint64_t queue_generate_evpid(uint32_t msgid);
 struct queue_backend *queue_backend_lookup(const char *);
-int queue_message_incoming_path(u_int32_t, char *, size_t);
-int queue_envelope_incoming_path(u_int64_t, char *, size_t);
-int queue_message_incoming_delete(u_int32_t);
-int queue_message_create(u_int32_t *);
-int queue_message_delete(u_int32_t);
-int queue_message_commit(u_int32_t);
-int queue_message_fd_r(u_int32_t);
-int queue_message_fd_rw(u_int32_t);
-int queue_message_corrupt(u_int32_t);
+int queue_message_incoming_path(uint32_t, char *, size_t);
+int queue_envelope_incoming_path(uint64_t, char *, size_t);
+int queue_message_incoming_delete(uint32_t);
+int queue_message_create(uint32_t *);
+int queue_message_delete(uint32_t);
+int queue_message_commit(uint32_t);
+int queue_message_fd_r(uint32_t);
+int queue_message_fd_rw(uint32_t);
+int queue_message_corrupt(uint32_t);
 int queue_envelope_create(struct envelope *);
 int queue_envelope_delete(struct envelope *);
-int queue_envelope_load(u_int64_t, struct envelope *);
+int queue_envelope_load(uint64_t, struct envelope *);
 int queue_envelope_update(struct envelope *);
-void *qwalk_new(u_int32_t);
-int   qwalk(void *, u_int64_t *);
+void *qwalk_new(uint32_t);
+int   qwalk(void *, uint64_t *);
 void  qwalk_close(void *);
 
 
@@ -1088,8 +1088,8 @@ SPLAY_PROTOTYPE(sessiontree, session, s_nodes, session_cmp);
 /* smtpd.c */
 int	 child_cmp(struct child *, struct child *);
 void imsg_event_add(struct imsgev *);
-void imsg_compose_event(struct imsgev *, u_int16_t, u_int32_t, pid_t,
-    int, void *, u_int16_t);
+void imsg_compose_event(struct imsgev *, uint16_t, uint32_t, pid_t,
+    int, void *, uint16_t);
 void imsg_dispatch(int, short, void *);
 const char * proc_to_str(int);
 const char * imsg_to_str(int);
@@ -1101,7 +1101,7 @@ void ssl_init(void);
 void ssl_transaction(struct session *);
 void ssl_session_init(struct session *);
 void ssl_session_destroy(struct session *);
-int ssl_load_certfile(const char *, u_int8_t);
+int ssl_load_certfile(const char *, uint8_t);
 void ssl_setup(struct listener *);
 int ssl_cmp(struct ssl *, struct ssl *);
 void *ssl_mta_init(struct ssl *);
@@ -1144,9 +1144,9 @@ struct user_backend *user_backend_lookup(enum user_type);
 /* util.c */
 typedef struct arglist arglist;
 struct arglist {
-	char    **list;
-	u_int   num;
-	u_int   nalloc;
+	char	**list;
+	uint	  num;
+	uint	  nalloc;
 };
 void addargs(arglist *, char *, ...)
 	__attribute__((format(printf, 2, 3)));
@@ -1165,11 +1165,11 @@ int secure_file(int, char *, char *, uid_t, int);
 int  lowercase(char *, char *, size_t);
 void xlowercase(char *, char *, size_t);
 void sa_set_port(struct sockaddr *, int);
-u_int64_t generate_uid(void);
+uint64_t generate_uid(void);
 void fdlimit(double);
 int availdesc(void);
-u_int32_t evpid_to_msgid(u_int64_t);
-u_int64_t msgid_to_evpid(u_int32_t);
+uint32_t evpid_to_msgid(uint64_t);
+uint64_t msgid_to_evpid(uint32_t);
 void log_imsg(int, int, struct imsg*);
 int ckdir(const char *, mode_t, uid_t, gid_t, int);
 int rmtree(char *, int);
diff --git a/usr.sbin/smtpd/smtpfilter.c b/usr.sbin/smtpd/smtpfilter.c
index ba0002e65f8..004cd1baf91 100644
--- a/usr.sbin/smtpd/smtpfilter.c
+++ b/usr.sbin/smtpd/smtpfilter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpfilter.c,v 1.2 2012/06/14 21:56:13 gilles Exp $	*/
+/*	$OpenBSD: smtpfilter.c,v 1.3 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -22,11 +22,11 @@
 
 #include "filter_api.h"
 
-int helo_cb(u_int64_t, struct filter_helo *, void *);
-int ehlo_cb(u_int64_t, struct filter_helo *, void *);
-int mail_cb(u_int64_t, struct filter_mail *, void *);
-int rcpt_cb(u_int64_t, struct filter_rcpt *, void *);
-int data_cb(u_int64_t, struct filter_data *, void *);
+int helo_cb(uint64_t, struct filter_helo *, void *);
+int ehlo_cb(uint64_t, struct filter_helo *, void *);
+int mail_cb(uint64_t, struct filter_mail *, void *);
+int rcpt_cb(uint64_t, struct filter_rcpt *, void *);
+int data_cb(uint64_t, struct filter_data *, void *);
 
 
 /*
@@ -56,19 +56,19 @@ int data_cb(u_int64_t, struct filter_data *, void *);
  */
 
 int
-helo_cb(u_int64_t id, struct filter_helo *helo, void *mystuff)
+helo_cb(uint64_t id, struct filter_helo *helo, void *mystuff)
 {
 	return 1;
 }
 
 int
-mail_cb(u_int64_t id, struct filter_mail *mail, void *mystuff)
+mail_cb(uint64_t id, struct filter_mail *mail, void *mystuff)
 {
 	return 1;
 }
 
 int
-rcpt_cb(u_int64_t id, struct filter_rcpt *rcpt, void *mystuff)
+rcpt_cb(uint64_t id, struct filter_rcpt *rcpt, void *mystuff)
 {
 	if (rcpt->user[0] == 'a')
 		return 0;
diff --git a/usr.sbin/smtpd/ssl.c b/usr.sbin/smtpd/ssl.c
index 72778a9232f..a76b14e315c 100644
--- a/usr.sbin/smtpd/ssl.c
+++ b/usr.sbin/smtpd/ssl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssl.c,v 1.45 2012/01/29 11:37:32 eric Exp $	*/
+/*	$OpenBSD: ssl.c,v 1.46 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -119,7 +119,7 @@ ssl_ctx_create(void)
 }
 
 int
-ssl_load_certfile(const char *name, u_int8_t flags)
+ssl_load_certfile(const char *name, uint8_t flags)
 {
 	struct ssl	*s;
 	struct ssl	 key;
diff --git a/usr.sbin/smtpd/util.c b/usr.sbin/smtpd/util.c
index 456170508cd..bbf8e013cc0 100644
--- a/usr.sbin/smtpd/util.c
+++ b/usr.sbin/smtpd/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.70 2012/08/11 12:43:11 eric Exp $	*/
+/*	$OpenBSD: util.c,v 1.71 2012/08/19 14:16:58 chl Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Markus Friedl.  All rights reserved.
@@ -655,10 +655,10 @@ text_to_netaddr(struct netaddr *netaddr, char *s)
 int
 text_to_relayhost(struct relayhost *relay, char *s)
 {
-	u_int32_t		 i;
+	uint32_t		 i;
 	struct schema {
 		char		*name;
-		u_int8_t	 flags;
+		uint8_t		 flags;
 	} schemas [] = {
 		{ "smtp://",		0				},
 		{ "smtps://",		F_SMTPS				},
@@ -764,7 +764,7 @@ addargs(arglist *args, char *fmt, ...)
 {
 	va_list ap;
 	char *cp;
-	u_int nalloc;
+	uint nalloc;
 	int r;
 
 	va_start(ap, fmt);
@@ -843,7 +843,7 @@ sa_set_port(struct sockaddr *sa, int port)
 	freeaddrinfo(res);
 }
 
-u_int64_t
+uint64_t
 generate_uid(void)
 {
 	static uint32_t id;
@@ -926,7 +926,7 @@ const char *
 log_in6addr(const struct in6_addr *addr)
 {
 	struct sockaddr_in6	sa_in6;
-	u_int16_t		tmp16;
+	uint16_t		tmp16;
 
 	bzero(&sa_in6, sizeof(sa_in6));
 	sa_in6.sin6_len = sizeof(sa_in6);
@@ -957,16 +957,16 @@ log_sockaddr(struct sockaddr *sa)
 		return (buf);
 }
 
-u_int32_t
-evpid_to_msgid(u_int64_t evpid)
+uint32_t
+evpid_to_msgid(uint64_t evpid)
 {
 	return (evpid >> 32);
 }
 
-u_int64_t
-msgid_to_evpid(u_int32_t msgid)
+uint64_t
+msgid_to_evpid(uint32_t msgid)
 {
-	return ((u_int64_t)msgid << 32);
+	return ((uint64_t)msgid << 32);
 }
 
 const char *