diff options
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/smtpd/aliases.c | 3 | ||||
-rw-r--r-- | usr.sbin/smtpd/bounce.c | 4 | ||||
-rw-r--r-- | usr.sbin/smtpd/expand.c | 3 | ||||
-rw-r--r-- | usr.sbin/smtpd/log.c | 3 | ||||
-rw-r--r-- | usr.sbin/smtpd/parse.y | 4 | ||||
-rw-r--r-- | usr.sbin/smtpd/runner.c | 3 | ||||
-rw-r--r-- | usr.sbin/smtpd/smtp.c | 4 | ||||
-rw-r--r-- | usr.sbin/smtpd/ssl.c | 3 |
8 files changed, 12 insertions, 15 deletions
diff --git a/usr.sbin/smtpd/aliases.c b/usr.sbin/smtpd/aliases.c index 4ee42e8a1f9..9d7dcb44e49 100644 --- a/usr.sbin/smtpd/aliases.c +++ b/usr.sbin/smtpd/aliases.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aliases.c,v 1.32 2010/04/27 09:49:23 gilles Exp $ */ +/* $OpenBSD: aliases.c,v 1.33 2010/05/19 20:57:10 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -23,7 +23,6 @@ #include <sys/socket.h> #include <ctype.h> -#include <db.h> #include <errno.h> #include <event.h> #include <fcntl.h> diff --git a/usr.sbin/smtpd/bounce.c b/usr.sbin/smtpd/bounce.c index 76a7f5d7efa..35eb10c8119 100644 --- a/usr.sbin/smtpd/bounce.c +++ b/usr.sbin/smtpd/bounce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bounce.c,v 1.18 2010/04/22 12:56:33 jacekm Exp $ */ +/* $OpenBSD: bounce.c,v 1.19 2010/05/19 20:57:10 gilles Exp $ */ /* * Copyright (c) 2009 Gilles Chehade <gilles@openbsd.org> @@ -116,7 +116,7 @@ void bounce_event(int fd, short event, void *p) { struct client_ctx *cc = p; - char *ep; + char *ep = NULL; if (event & EV_TIMEOUT) { ep = "150 timeout"; diff --git a/usr.sbin/smtpd/expand.c b/usr.sbin/smtpd/expand.c index b3fbcdf54dd..c0bfbc44e81 100644 --- a/usr.sbin/smtpd/expand.c +++ b/usr.sbin/smtpd/expand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expand.c,v 1.4 2010/04/27 09:49:23 gilles Exp $ */ +/* $OpenBSD: expand.c,v 1.5 2010/05/19 20:57:10 gilles Exp $ */ /* * Copyright (c) 2009 Gilles Chehade <gilles@openbsd.org> @@ -29,7 +29,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <util.h> #include "smtpd.h" diff --git a/usr.sbin/smtpd/log.c b/usr.sbin/smtpd/log.c index 5458c36907c..47f0e6e2291 100644 --- a/usr.sbin/smtpd/log.c +++ b/usr.sbin/smtpd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.4 2010/01/03 14:37:37 chl Exp $ */ +/* $OpenBSD: log.c,v 1.5 2010/05/19 20:57:10 gilles Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -21,7 +21,6 @@ #include <sys/tree.h> #include <sys/param.h> #include <sys/socket.h> -#include <sys/time.h> #include <errno.h> #include <event.h> diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 67ba39c4f21..81df82cc22f 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.56 2010/04/27 10:17:53 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.57 2010/05/19 20:57:10 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -23,7 +23,6 @@ %{ #include <sys/types.h> -#include <sys/time.h> #include <sys/queue.h> #include <sys/tree.h> #include <sys/param.h> @@ -44,6 +43,7 @@ #include <netdb.h> #include <stdarg.h> #include <stdio.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #include <unistd.h> diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c index 7dcf6427484..40a0f912a1f 100644 --- a/usr.sbin/smtpd/runner.c +++ b/usr.sbin/smtpd/runner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: runner.c,v 1.86 2010/04/22 12:56:33 jacekm Exp $ */ +/* $OpenBSD: runner.c,v 1.87 2010/05/19 20:57:10 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -24,7 +24,6 @@ #include <sys/param.h> #include <sys/socket.h> #include <sys/stat.h> -#include <sys/time.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c index a977a3786a9..4e9a8eba531 100644 --- a/usr.sbin/smtpd/smtp.c +++ b/usr.sbin/smtpd/smtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp.c,v 1.70 2010/04/21 18:54:43 jacekm Exp $ */ +/* $OpenBSD: smtp.c,v 1.71 2010/05/19 20:57:10 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -24,6 +24,8 @@ #include <sys/param.h> #include <sys/socket.h> +#include <arpa/inet.h> + #include <ctype.h> #include <errno.h> #include <event.h> diff --git a/usr.sbin/smtpd/ssl.c b/usr.sbin/smtpd/ssl.c index 0c5f9258580..02a74762688 100644 --- a/usr.sbin/smtpd/ssl.c +++ b/usr.sbin/smtpd/ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.c,v 1.23 2009/11/11 15:36:10 jacekm Exp $ */ +/* $OpenBSD: ssl.c,v 1.24 2010/05/19 20:57:10 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -23,7 +23,6 @@ #include <sys/param.h> #include <sys/socket.h> #include <sys/stat.h> -#include <sys/time.h> #include <ctype.h> #include <event.h> |