aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Chehade <gilles@poolp.org>2015-12-13 11:59:06 +0100
committerGilles Chehade <gilles@poolp.org>2015-12-13 11:59:06 +0100
commitce8191682a7a23f121bfb521d0f40857eeab349f (patch)
tree63e7d55d58302af8fc296e2ff7c16661b05265da
parentsync: (diff)
downloadOpenSMTPD-ce8191682a7a23f121bfb521d0f40857eeab349f.tar.xz
OpenSMTPD-ce8191682a7a23f121bfb521d0f40857eeab349f.zip
sync
-rw-r--r--smtpd/pony.c2
-rw-r--r--smtpd/smtp_session.c2
-rw-r--r--smtpd/smtpd.conf.54
-rw-r--r--smtpd/smtpd/Makefile2
4 files changed, 5 insertions, 5 deletions
diff --git a/smtpd/pony.c b/smtpd/pony.c
index b7e27026..1bc552db 100644
--- a/smtpd/pony.c
+++ b/smtpd/pony.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: pony.c,v 1.11 2015/12/13 10:54:11 gilles Exp $ */
/*
* Copyright (c) 2014 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/smtp_session.c b/smtpd/smtp_session.c
index 07c52b33..89decd16 100644
--- a/smtpd/smtp_session.c
+++ b/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.209 2014/04/29 12:18:27 reyk Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.262 2015/12/13 10:54:11 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/smtpd.conf.5 b/smtpd/smtpd.conf.5
index 4583ac2b..4e3f3553 100644
--- a/smtpd/smtpd.conf.5
+++ b/smtpd/smtpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd.conf.5,v 1.118 2014/05/15 19:36:45 jmc Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.145 2015/12/13 10:56:26 gilles Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\"
-.Dd $Mdocdate: May 15 2014 $
+.Dd $Mdocdate: December 13 2015 $
.Dt SMTPD.CONF 5
.Os
.Sh NAME
diff --git a/smtpd/smtpd/Makefile b/smtpd/smtpd/Makefile
index 5626c7a3..afef4f08 100644
--- a/smtpd/smtpd/Makefile
+++ b/smtpd/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2015/12/01 10:06:59 gilles Exp $
+# $OpenBSD: Makefile,v 1.82 2015/12/13 10:54:11 gilles Exp $
.PATH: ${.CURDIR}/..