aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Chehade <gilles@poolp.org>2013-01-28 10:08:36 +0100
committerGilles Chehade <gilles@poolp.org>2013-01-28 10:08:36 +0100
commit348fe4e59c3af4bc4fce8d6d0de79c19701f738e (patch)
tree1319eb96b2321b444e91c811e9ca5110e4b8be32
parentfix warnings (diff)
downloadOpenSMTPD-348fe4e59c3af4bc4fce8d6d0de79c19701f738e.tar.xz
OpenSMTPD-348fe4e59c3af4bc4fce8d6d0de79c19701f738e.zip
sync with OpenBSD tree: cvsid + man page fixes
-rw-r--r--smtpd/aldap.c4
-rw-r--r--smtpd/aldap.h4
-rw-r--r--smtpd/aliases.54
-rw-r--r--smtpd/aliases.c2
-rw-r--r--smtpd/ber.c2
-rw-r--r--smtpd/ber.h2
-rw-r--r--smtpd/bounce.c2
-rw-r--r--smtpd/ca.c2
-rw-r--r--smtpd/compress_backend.c2
-rw-r--r--smtpd/compress_gzip.c2
-rw-r--r--smtpd/config.c2
-rw-r--r--smtpd/control.c2
-rw-r--r--smtpd/delivery.c2
-rw-r--r--smtpd/delivery_filename.c2
-rw-r--r--smtpd/delivery_maildir.c2
-rw-r--r--smtpd/delivery_mbox.c2
-rw-r--r--smtpd/delivery_mda.c2
-rw-r--r--smtpd/dict.c2
-rw-r--r--smtpd/dns.c2
-rw-r--r--smtpd/enqueue.c2
-rw-r--r--smtpd/envelope.c2
-rw-r--r--smtpd/expand.c2
-rw-r--r--smtpd/filter_api.c2
-rw-r--r--smtpd/forward.54
-rw-r--r--smtpd/forward.c2
-rw-r--r--smtpd/imsgproc.c2
-rw-r--r--smtpd/iobuf.c2
-rw-r--r--smtpd/iobuf.h2
-rw-r--r--smtpd/ioev.c2
-rw-r--r--smtpd/ioev.h2
-rw-r--r--smtpd/lka.c2
-rw-r--r--smtpd/lka_session.c2
-rw-r--r--smtpd/log.c2
-rw-r--r--smtpd/log.h2
-rw-r--r--smtpd/makemap.87
-rw-r--r--smtpd/makemap.c2
-rw-r--r--smtpd/mda.c2
-rw-r--r--smtpd/mfa.c2
-rw-r--r--smtpd/mfa_session.c2
-rw-r--r--smtpd/mproc.c2
-rw-r--r--smtpd/mta_session.c2
-rw-r--r--smtpd/newaliases.84
-rw-r--r--smtpd/parse.y2
-rw-r--r--smtpd/parser.c2
-rw-r--r--smtpd/parser.h2
-rw-r--r--smtpd/queue.c2
-rw-r--r--smtpd/queue_backend.c2
-rw-r--r--smtpd/queue_fsqueue.c2
-rw-r--r--smtpd/queue_null.c2
-rw-r--r--smtpd/queue_ram.c2
-rw-r--r--smtpd/ruleset.c2
-rw-r--r--smtpd/scheduler.c2
-rw-r--r--smtpd/scheduler_backend.c2
-rw-r--r--smtpd/scheduler_null.c2
-rw-r--r--smtpd/scheduler_ramqueue.c2
-rw-r--r--smtpd/smtp.c2
-rw-r--r--smtpd/smtp_session.c2
-rw-r--r--smtpd/smtpctl.840
-rw-r--r--smtpd/smtpctl.c2
-rw-r--r--smtpd/smtpd-api.h2
-rw-r--r--smtpd/smtpd.84
-rw-r--r--smtpd/smtpd.c2
-rw-r--r--smtpd/smtpd.conf.530
-rw-r--r--smtpd/smtpd.h2
-rw-r--r--smtpd/smtpfilter.c2
-rw-r--r--smtpd/ssl.c2
-rw-r--r--smtpd/ssl.h2
-rw-r--r--smtpd/ssl_privsep.c2
-rw-r--r--smtpd/ssl_smtpd.c2
-rw-r--r--smtpd/table.c2
-rw-r--r--smtpd/table_db.c2
-rw-r--r--smtpd/table_getpwnam.c2
-rw-r--r--smtpd/table_sqlite.c2
-rw-r--r--smtpd/table_static.c2
-rw-r--r--smtpd/tree.c2
-rw-r--r--smtpd/util.c2
-rw-r--r--smtpd/waitq.c2
77 files changed, 119 insertions, 118 deletions
diff --git a/smtpd/aldap.c b/smtpd/aldap.c
index b1f9c342..38e09fc8 100644
--- a/smtpd/aldap.c
+++ b/smtpd/aldap.c
@@ -1,5 +1,5 @@
-/* $Id: aldap.c,v 1.1 2012/08/30 18:25:44 gilles Exp $ */
-/* $OpenBSD: aldap.c,v 1.1 2012/08/30 18:25:44 gilles Exp $ */
+/* $Id: aldap.c,v 1.3 2013/01/26 09:37:22 gilles Exp $ */
+/* $OpenBSD: aldap.c,v 1.3 2013/01/26 09:37:22 gilles Exp $ */
/*
* Copyright (c) 2008 Alexander Schrijver <aschrijver@openbsd.org>
diff --git a/smtpd/aldap.h b/smtpd/aldap.h
index 8abf0b1d..a516789b 100644
--- a/smtpd/aldap.h
+++ b/smtpd/aldap.h
@@ -1,5 +1,5 @@
-/* $Id: aldap.h,v 1.1 2012/08/30 18:25:44 gilles Exp $ */
-/* $OpenBSD: aldap.h,v 1.1 2012/08/30 18:25:44 gilles Exp $ */
+/* $Id: aldap.h,v 1.3 2013/01/26 09:37:23 gilles Exp $ */
+/* $OpenBSD: aldap.h,v 1.3 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Alexander Schrijver <aschrijver@openbsd.org>
diff --git a/smtpd/aliases.5 b/smtpd/aliases.5
index 4f63ef9a..cc3c7208 100644
--- a/smtpd/aliases.5
+++ b/smtpd/aliases.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aliases.5,v 1.4 2012/09/14 17:35:27 jmc Exp $
+.\" $OpenBSD: aliases.5,v 1.5 2013/01/26 09:37:23 gilles Exp $
.\"
.\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 14 2012 $
+.Dd $Mdocdate: January 26 2013 $
.Dt ALIASES 5
.Os
.Sh NAME
diff --git a/smtpd/aliases.c b/smtpd/aliases.c
index 3e962a9a..c2502fa4 100644
--- a/smtpd/aliases.c
+++ b/smtpd/aliases.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aliases.c,v 1.58 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: aliases.c,v 1.59 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/ber.c b/smtpd/ber.c
index c230472e..01da3135 100644
--- a/smtpd/ber.c
+++ b/smtpd/ber.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ber.c,v 1.1 2012/08/30 18:25:44 gilles Exp $ */
+/* $OpenBSD: ber.c,v 1.3 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net>
diff --git a/smtpd/ber.h b/smtpd/ber.h
index 262646fa..03949f96 100644
--- a/smtpd/ber.h
+++ b/smtpd/ber.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ber.h,v 1.1 2012/08/30 18:25:44 gilles Exp $ */
+/* $OpenBSD: ber.h,v 1.3 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net>
diff --git a/smtpd/bounce.c b/smtpd/bounce.c
index 3790b530..4700ef1e 100644
--- a/smtpd/bounce.c
+++ b/smtpd/bounce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bounce.c,v 1.52 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: bounce.c,v 1.54 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2009 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/ca.c b/smtpd/ca.c
index 1b8093d7..970ccb92 100644
--- a/smtpd/ca.c
+++ b/smtpd/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: ca.c,v 1.1 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/compress_backend.c b/smtpd/compress_backend.c
index 101b60b8..b7a95767 100644
--- a/smtpd/compress_backend.c
+++ b/smtpd/compress_backend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compress_backend.c,v 1.6 2012/09/16 15:55:55 chl Exp $ */
+/* $OpenBSD: compress_backend.c,v 1.7 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Charles Longeau <chl@openbsd.org>
diff --git a/smtpd/compress_gzip.c b/smtpd/compress_gzip.c
index 4c1ffea4..32a31770 100644
--- a/smtpd/compress_gzip.c
+++ b/smtpd/compress_gzip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compress_gzip.c,v 1.5 2012/10/11 21:34:19 gilles Exp $ */
+/* $OpenBSD: compress_gzip.c,v 1.6 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/config.c b/smtpd/config.c
index a04710f1..e553c5be 100644
--- a/smtpd/config.c
+++ b/smtpd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.17 2012/09/27 17:47:49 chl Exp $ */
+/* $OpenBSD: config.c,v 1.19 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
diff --git a/smtpd/control.c b/smtpd/control.c
index 4607c0bf..a697ee7a 100644
--- a/smtpd/control.c
+++ b/smtpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.78 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: control.c,v 1.82 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/delivery.c b/smtpd/delivery.c
index 4c86bdf0..c2d63484 100644
--- a/smtpd/delivery.c
+++ b/smtpd/delivery.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: delivery.c,v 1.2 2012/01/13 10:53:12 chl Exp $ */
+/* $OpenBSD: delivery.c,v 1.3 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/delivery_filename.c b/smtpd/delivery_filename.c
index 0b9ffc83..097d6815 100644
--- a/smtpd/delivery_filename.c
+++ b/smtpd/delivery_filename.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: delivery_filename.c,v 1.6 2012/10/03 17:58:03 gilles Exp $ */
+/* $OpenBSD: delivery_filename.c,v 1.8 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/delivery_maildir.c b/smtpd/delivery_maildir.c
index 6e307346..663bb1cb 100644
--- a/smtpd/delivery_maildir.c
+++ b/smtpd/delivery_maildir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: delivery_maildir.c,v 1.9 2012/10/03 17:58:03 gilles Exp $ */
+/* $OpenBSD: delivery_maildir.c,v 1.11 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/delivery_mbox.c b/smtpd/delivery_mbox.c
index 2ec612f4..34b9eb37 100644
--- a/smtpd/delivery_mbox.c
+++ b/smtpd/delivery_mbox.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: delivery_mbox.c,v 1.6 2012/10/03 17:58:03 gilles Exp $ */
+/* $OpenBSD: delivery_mbox.c,v 1.8 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/delivery_mda.c b/smtpd/delivery_mda.c
index 31bc4641..a087f561 100644
--- a/smtpd/delivery_mda.c
+++ b/smtpd/delivery_mda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: delivery_mda.c,v 1.5 2012/10/03 17:58:03 gilles Exp $ */
+/* $OpenBSD: delivery_mda.c,v 1.7 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/dict.c b/smtpd/dict.c
index 52a3efba..b513413e 100644
--- a/smtpd/dict.c
+++ b/smtpd/dict.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: dict.c,v 1.1 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/dns.c b/smtpd/dns.c
index fa2d8b0f..eae44611 100644
--- a/smtpd/dns.c
+++ b/smtpd/dns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dns.c,v 1.61 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: dns.c,v 1.64 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/enqueue.c b/smtpd/enqueue.c
index 57675b80..8d332544 100644
--- a/smtpd/enqueue.c
+++ b/smtpd/enqueue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: enqueue.c,v 1.64 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: enqueue.c,v 1.66 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2005 Henning Brauer <henning@bulabula.org>
diff --git a/smtpd/envelope.c b/smtpd/envelope.c
index 4db951c6..3a13db31 100644
--- a/smtpd/envelope.c
+++ b/smtpd/envelope.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: envelope.c,v 1.17 2012/10/12 08:51:02 eric Exp $ */
+/* $OpenBSD: envelope.c,v 1.18 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/expand.c b/smtpd/expand.c
index 745b67d8..434d08cd 100644
--- a/smtpd/expand.c
+++ b/smtpd/expand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expand.c,v 1.18 2012/10/10 18:02:37 eric Exp $ */
+/* $OpenBSD: expand.c,v 1.19 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2009 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/filter_api.c b/smtpd/filter_api.c
index 9aaab339..ba7696f3 100644
--- a/smtpd/filter_api.c
+++ b/smtpd/filter_api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: filter_api.c,v 1.4 2012/08/19 14:16:58 chl Exp $ */
+/* $OpenBSD: filter_api.c,v 1.6 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/forward.5 b/smtpd/forward.5
index 3b59f179..5fa669ab 100644
--- a/smtpd/forward.5
+++ b/smtpd/forward.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: forward.5,v 1.6 2012/09/17 05:46:06 jmc Exp $
+.\" $OpenBSD: forward.5,v 1.7 2013/01/26 09:37:23 gilles Exp $
.\"
.\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 17 2012 $
+.Dd $Mdocdate: January 26 2013 $
.Dt FORWARD 5
.Os
.Sh NAME
diff --git a/smtpd/forward.c b/smtpd/forward.c
index 8c04ed04..1738c931 100644
--- a/smtpd/forward.c
+++ b/smtpd/forward.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: forward.c,v 1.32 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: forward.c,v 1.33 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/imsgproc.c b/smtpd/imsgproc.c
index 6c32125a..18a22ebf 100644
--- a/smtpd/imsgproc.c
+++ b/smtpd/imsgproc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: imsgproc.c,v 1.1 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/iobuf.c b/smtpd/iobuf.c
index 5ea8ac7b..05233029 100644
--- a/smtpd/iobuf.c
+++ b/smtpd/iobuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iobuf.c,v 1.2 2012/02/01 17:25:29 eric Exp $ */
+/* $OpenBSD: iobuf.c,v 1.4 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
*
diff --git a/smtpd/iobuf.h b/smtpd/iobuf.h
index 9ecf6e1e..eeef1114 100644
--- a/smtpd/iobuf.h
+++ b/smtpd/iobuf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: iobuf.h,v 1.1 2012/01/29 00:32:51 eric Exp $ */
+/* $OpenBSD: iobuf.h,v 1.3 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
*
diff --git a/smtpd/ioev.c b/smtpd/ioev.c
index 4b17f8e7..baf111cd 100644
--- a/smtpd/ioev.c
+++ b/smtpd/ioev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioev.c,v 1.8 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: ioev.c,v 1.10 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
*
diff --git a/smtpd/ioev.h b/smtpd/ioev.h
index 27681427..91767d77 100644
--- a/smtpd/ioev.h
+++ b/smtpd/ioev.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioev.h,v 1.2 2012/10/10 19:38:04 eric Exp $ */
+/* $OpenBSD: ioev.h,v 1.3 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
*
diff --git a/smtpd/lka.c b/smtpd/lka.c
index 3ebefe4d..3ce7406e 100644
--- a/smtpd/lka.c
+++ b/smtpd/lka.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lka.c,v 1.146 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: lka.c,v 1.147 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
diff --git a/smtpd/lka_session.c b/smtpd/lka_session.c
index 4e75ddd1..e044c230 100644
--- a/smtpd/lka_session.c
+++ b/smtpd/lka_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lka_session.c,v 1.49 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: lka_session.c,v 1.51 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/log.c b/smtpd/log.c
index 9a4c4e5b..637bf8e4 100644
--- a/smtpd/log.c
+++ b/smtpd/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.12 2011/10/22 00:16:33 eric Exp $ */
+/* $OpenBSD: log.c,v 1.14 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
diff --git a/smtpd/log.h b/smtpd/log.h
index 52e5834b..19367f8b 100644
--- a/smtpd/log.h
+++ b/smtpd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.2 2011/10/22 00:16:33 eric Exp $ */
+/* $OpenBSD: log.h,v 1.4 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2010 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/makemap.8 b/smtpd/makemap.8
index aa2931d9..0fc3fcca 100644
--- a/smtpd/makemap.8
+++ b/smtpd/makemap.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: makemap.8,v 1.17 2012/05/13 13:57:24 jmc Exp $
+.\" $OpenBSD: makemap.8,v 1.21 2013/01/26 14:13:25 jmc Exp $
.\"
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@openbsd.org>
.\" Copyright (c) 2008-2009 Gilles Chechade <gilles@poolp.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: May 13 2012 $
+.Dd $Mdocdate: January 26 2013 $
.Dt MAKEMAP 8
.Os
.Sh NAME
@@ -68,13 +68,12 @@ The available output types are:
.It Cm aliases
The mapped value is a comma-separated list of mail destinations.
This format can be used for building user aliases and
-user mappings for virtual domains files.
+user mappings for virtual domain files.
.It Cm set
There is no mapped value \(en a map of this type will only allow for
the lookup of keys.
This format can be used for building primary domain maps.
.El
-.Pp
.El
.Sh PRIMARY DOMAINS
Primary domains can be kept in tables.
diff --git a/smtpd/makemap.c b/smtpd/makemap.c
index d4848bc5..c8382f75 100644
--- a/smtpd/makemap.c
+++ b/smtpd/makemap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: makemap.c,v 1.40 2012/10/13 09:44:25 gilles Exp $ */
+/* $OpenBSD: makemap.c,v 1.42 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/mda.c b/smtpd/mda.c
index c14a22b4..2b4199e6 100644
--- a/smtpd/mda.c
+++ b/smtpd/mda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mda.c,v 1.84 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: mda.c,v 1.85 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/mfa.c b/smtpd/mfa.c
index 1d9aea55..ad484c51 100644
--- a/smtpd/mfa.c
+++ b/smtpd/mfa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfa.c,v 1.73 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: mfa.c,v 1.75 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/mfa_session.c b/smtpd/mfa_session.c
index 2523dff6..4bae035d 100644
--- a/smtpd/mfa_session.c
+++ b/smtpd/mfa_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfa_session.c,v 1.11 2012/10/11 21:51:37 gilles Exp $ */
+/* $OpenBSD: mfa_session.c,v 1.13 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/mproc.c b/smtpd/mproc.c
index 4eb20bfd..b37cfe8b 100644
--- a/smtpd/mproc.c
+++ b/smtpd/mproc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dns.c,v 1.61 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: mproc.c,v 1.1 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@faurot.net>
diff --git a/smtpd/mta_session.c b/smtpd/mta_session.c
index d8b7c333..cb253ebd 100644
--- a/smtpd/mta_session.c
+++ b/smtpd/mta_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mta_session.c,v 1.26 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: mta_session.c,v 1.27 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
diff --git a/smtpd/newaliases.8 b/smtpd/newaliases.8
index 9b505df8..21f37a49 100644
--- a/smtpd/newaliases.8
+++ b/smtpd/newaliases.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: newaliases.8,v 1.8 2010/09/03 11:22:36 jmc Exp $
+.\" $OpenBSD: newaliases.8,v 1.9 2013/01/26 09:37:23 gilles Exp $
.\"
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@openbsd.org>
.\" Copyright (c) 2008-2009 Gilles Chechade <gilles@poolp.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: January 26 2013 $
.Dt NEWALIASES 8
.Os
.Sh NAME
diff --git a/smtpd/parse.y b/smtpd/parse.y
index 11923462..02842b6e 100644
--- a/smtpd/parse.y
+++ b/smtpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.110 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: parse.y,v 1.111 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/parser.c b/smtpd/parser.c
index 5b0d2703..0765f595 100644
--- a/smtpd/parser.c
+++ b/smtpd/parser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parser.c,v 1.29 2012/10/14 11:58:23 gilles Exp $ */
+/* $OpenBSD: parser.c,v 1.31 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
diff --git a/smtpd/parser.h b/smtpd/parser.h
index d4ef8687..a87d96a4 100644
--- a/smtpd/parser.h
+++ b/smtpd/parser.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: parser.h,v 1.23 2012/10/14 11:58:23 gilles Exp $ */
+/* $OpenBSD: parser.h,v 1.24 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
diff --git a/smtpd/queue.c b/smtpd/queue.c
index 2e764b4d..c47492f3 100644
--- a/smtpd/queue.c
+++ b/smtpd/queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue.c,v 1.141 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: queue.c,v 1.145 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/queue_backend.c b/smtpd/queue_backend.c
index ff02a3b5..84b91953 100644
--- a/smtpd/queue_backend.c
+++ b/smtpd/queue_backend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue_backend.c,v 1.40 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: queue_backend.c,v 1.42 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/queue_fsqueue.c b/smtpd/queue_fsqueue.c
index 2467a245..d640f5b6 100644
--- a/smtpd/queue_fsqueue.c
+++ b/smtpd/queue_fsqueue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue_fsqueue.c,v 1.55 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: queue_fsqueue.c,v 1.57 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/queue_null.c b/smtpd/queue_null.c
index 70aa0e85..77011123 100644
--- a/smtpd/queue_null.c
+++ b/smtpd/queue_null.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue_fsqueue.c,v 1.53 2012/08/30 18:19:50 eric Exp $ */
+/* $OpenBSD: queue_null.c,v 1.1 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
diff --git a/smtpd/queue_ram.c b/smtpd/queue_ram.c
index 4b26814f..5308dd50 100644
--- a/smtpd/queue_ram.c
+++ b/smtpd/queue_ram.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue_fsqueue.c,v 1.53 2012/08/30 18:19:50 eric Exp $ */
+/* $OpenBSD: queue_ram.c,v 1.1 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
diff --git a/smtpd/ruleset.c b/smtpd/ruleset.c
index 88c1419a..04ffe2cd 100644
--- a/smtpd/ruleset.c
+++ b/smtpd/ruleset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ruleset.c,v 1.26 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: ruleset.c,v 1.27 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2009 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/scheduler.c b/smtpd/scheduler.c
index cc3b3c78..c99a3c7a 100644
--- a/smtpd/scheduler.c
+++ b/smtpd/scheduler.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scheduler.c,v 1.23 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: scheduler.c,v 1.25 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/scheduler_backend.c b/smtpd/scheduler_backend.c
index 61d11927..2c0a83c8 100644
--- a/smtpd/scheduler_backend.c
+++ b/smtpd/scheduler_backend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scheduler_backend.c,v 1.6 2012/09/11 19:19:13 gilles Exp $ */
+/* $OpenBSD: scheduler_backend.c,v 1.8 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/scheduler_null.c b/smtpd/scheduler_null.c
index a3f10f94..f9e6e272 100644
--- a/smtpd/scheduler_null.c
+++ b/smtpd/scheduler_null.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scheduler_ramqueue.c,v 1.24 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: scheduler_null.c,v 1.1 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
diff --git a/smtpd/scheduler_ramqueue.c b/smtpd/scheduler_ramqueue.c
index c56bb651..723fc02e 100644
--- a/smtpd/scheduler_ramqueue.c
+++ b/smtpd/scheduler_ramqueue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scheduler_ramqueue.c,v 1.24 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: scheduler_ramqueue.c,v 1.26 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/smtp.c b/smtpd/smtp.c
index 2762bb84..635c1b32 100644
--- a/smtpd/smtp.c
+++ b/smtpd/smtp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp.c,v 1.121 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: smtp.c,v 1.123 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/smtp_session.c b/smtpd/smtp_session.c
index beb2cf08..5feccd75 100644
--- a/smtpd/smtp_session.c
+++ b/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.175 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.177 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/smtpctl.8 b/smtpd/smtpctl.8
index 5f08e274..2cfa7138 100644
--- a/smtpd/smtpctl.8
+++ b/smtpd/smtpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpctl.8,v 1.34 2012/10/17 08:38:48 eric Exp $
+.\" $OpenBSD: smtpctl.8,v 1.38 2013/01/26 14:13:25 jmc Exp $
.\"
.\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
.\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: October 17 2012 $
+.Dd $Mdocdate: January 26 2013 $
.Dt SMTPCTL 8
.Os
.Sh NAME
@@ -50,7 +50,7 @@ except for some counters which are always absolute values.
The first line reports the current value of each counter.
The fields are:
.Pp
-.Bl -compact -bullet
+.Bl -bullet -compact
.It
Current number of active SMTP clients (absolute value).
.It
@@ -85,6 +85,17 @@ Temporarily stop relaying and deliveries to
remote users.
.It Cm pause smtp
Temporarily stop accepting incoming sessions.
+.It Cm profile Ar subsystem
+Enables real-time profiling of
+.Ar subsystem .
+Supported subsystems are:
+.Pp
+.Bl -bullet -compact
+.It
+queue, to profile cost of queue IO
+.It
+imsg, to profile cost of event handlers
+.El
.It Cm remove Ar envelope-id | message-id
Remove a single envelope, or all envelopes with the same message ID.
.It Cm resume mda
@@ -107,9 +118,9 @@ Display information concerning envelopes that are currently in the queue.
Each line of output describes a single envelope.
It consists of the following fields, separated by a "|":
.Pp
-.Bl -compact -bullet
+.Bl -bullet -compact
.It
-Envelope id.
+Envelope ID.
.It
Address family of the client which enqueued the mail.
.It
@@ -153,7 +164,7 @@ Enables real-time tracing of
.Ar subsystem .
Supported subsystems are:
.Pp
-.Bl -compact -bullet
+.Bl -bullet -compact
.It
imsg
.It
@@ -177,23 +188,12 @@ imsg-size
.It
all
.El
-.It Cm untrace Ar subsystem
-Disables real-time tracing of
-.Ar subsystem .
-.It Cm profile Ar subsystem
-Enables real-time profiling of
-.Ar subsystem .
-Supported subsystems are:
-.Pp
-.Bl -compact -bullet
-.It
-queue, to profile cost of queue IO
-.It
-imsg, to profile cost of event handlers
-.El
.It Cm unprofile Ar subsystem
Disables real-time profiling of
.Ar subsystem .
+.It Cm untrace Ar subsystem
+Disables real-time tracing of
+.Ar subsystem .
.It Cm update table Ar name
For table backends that provide caching, causes
.Xr smtpd 8
diff --git a/smtpd/smtpctl.c b/smtpd/smtpctl.c
index 47cb26fc..8c699275 100644
--- a/smtpd/smtpctl.c
+++ b/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpctl.c,v 1.95 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: smtpctl.c,v 1.99 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2006 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/smtpd-api.h b/smtpd/smtpd-api.h
index e98f1279..0f6218b7 100644
--- a/smtpd/smtpd-api.h
+++ b/smtpd/smtpd-api.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: filter_api.h,v 1.4 2012/08/20 21:14:17 gilles Exp $ */
+/* $OpenBSD: smtpd-api.h,v 1.1 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/smtpd.8 b/smtpd/smtpd.8
index 9d754825..889cd91e 100644
--- a/smtpd/smtpd.8
+++ b/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd.8,v 1.17 2012/10/17 16:39:49 eric Exp $
+.\" $OpenBSD: smtpd.8,v 1.18 2013/01/26 09:37:23 gilles Exp $
.\"
.\" Copyright (c) 2012, Eric Faurot <eric@openbsd.org>
.\" Copyright (c) 2008, Gilles Chehade <gilles@poolp.org>
@@ -16,7 +16,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: October 17 2012 $
+.Dd $Mdocdate: January 26 2013 $
.Dt SMTPD 8
.Os
.Sh NAME
diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c
index 970e284b..272c7018 100644
--- a/smtpd/smtpd.c
+++ b/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.181 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: smtpd.c,v 1.184 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/smtpd.conf.5 b/smtpd/smtpd.conf.5
index bc4cc9b9..c940a5d8 100644
--- a/smtpd/smtpd.conf.5
+++ b/smtpd/smtpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd.conf.5,v 1.76 2012/10/16 16:47:40 jmc Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.79 2013/01/26 17:02:52 jmc 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: October 16 2012 $
+.Dd $Mdocdate: January 26 2013 $
.Dt SMTPD.CONF 5
.Os
.Sh NAME
@@ -78,8 +78,8 @@ The following formats are currently supported:
%{user.directory} home directory of the local user
.Ed
.Pp
-Expansion formats also support partial expansion using the optional bracket notations
-with substring offset.
+Expansion formats also support partial expansion using the optional
+bracket notations with substring offset.
For example, with recipient domain "example.org":
.Bd -literal -offset indent
%{rcpt.domain[0]} expands to "e"
@@ -234,28 +234,30 @@ table types.
.Op , Ar value_n
.Ic }
.Xc
-Tables containing list of static values may be declared using an inlined notation.
+Tables containing list of static values may be declared
+using an inlined notation.
.Pp
The table is identified using table name
.Ar name ;
the name itself is arbitrarily chosen.
.Pp
-The table must contain at least one value and may declare many values as a list of
-comma separated strings.
+The table must contain at least one value and may declare many values as a
+list of comma separated strings.
.It Xo
.Ic table Ar name
.Ic { Ar key => value
.Op , key_n => value_n
.Ic }
.Xc
-Tables containing static key-value mappings may be declared using an inlined notation.
+Tables containing static key-value mappings may be declared
+using an inlined notation.
.Pp
The table is identified using table name
.Ar name ;
the name itself is arbitrarily chosen.
.Pp
-The table must contain at least one key-value mapping and may declare many mappings as
-a list of comma separated
+The table must contain at least one key-value mapping and may declare
+many mappings as a list of comma separated
.Ar key => value
descriptions.
.It Ic max-message-size Ar n
@@ -427,7 +429,7 @@ specified to override the system database:
.It Xo
.Op Ic users Ar <table>
.Xc
-Lookup users in the table
+Look up users in the table
.Ar table
instead of performing system lookups using the
.Xr getpwnam 3
@@ -493,7 +495,7 @@ If the
.Ic source
parameter is specified,
.Xr smtpd 8
-will explicitely bind to an address found in the table referenced by
+will explicitly bind to an address found in the table referenced by
.Ar table
when connecting to the relay.
If the table contains more than one address, they are picked in turn each
@@ -571,7 +573,7 @@ If the
.Ic source
parameter is specified,
.Xr smtpd 8
-will explicitely bind to an address found in the table referenced by
+will explicitly bind to an address found in the table referenced by
.Ar table
when connecting to the relay.
If the table contains more than one address, they are picked in turn each
@@ -626,7 +628,7 @@ would look like this:
.Bd -literal -offset indent
listen on lo0
table aliases db:/etc/mail/aliases.db
-table secrets db:/etc/mail/secrets.db"
+table secrets db:/etc/mail/secrets.db
accept for local alias <aliases> deliver to mbox
accept for any relay via tls+auth://smtp.example.com auth <secrets>
.Ed
diff --git a/smtpd/smtpd.h b/smtpd/smtpd.h
index 3fea387f..97fab2d3 100644
--- a/smtpd/smtpd.h
+++ b/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.395 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: smtpd.h,v 1.398 2013/01/26 09:37:23 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/smtpfilter.c b/smtpd/smtpfilter.c
index b99eac3c..d39f6ec5 100644
--- a/smtpd/smtpfilter.c
+++ b/smtpd/smtpfilter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpfilter.c,v 1.5 2012/09/03 21:28:21 chl Exp $ */
+/* $OpenBSD: smtpfilter.c,v 1.6 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/ssl.c b/smtpd/ssl.c
index 09d79c06..1a5e051c 100644
--- a/smtpd/ssl.c
+++ b/smtpd/ssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.c,v 1.50 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: ssl.c,v 1.52 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
diff --git a/smtpd/ssl.h b/smtpd/ssl.h
index 4d15ef34..640dc63f 100644
--- a/smtpd/ssl.h
+++ b/smtpd/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.c,v 1.50 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: ssl.h,v 1.1 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2013 Gilles Chehade <gilles@poolp.org>
*
diff --git a/smtpd/ssl_privsep.c b/smtpd/ssl_privsep.c
index bb58c052..ffd62166 100644
--- a/smtpd/ssl_privsep.c
+++ b/smtpd/ssl_privsep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_privsep.c,v 1.9 2012/10/04 20:53:30 reyk Exp $ */
+/* $OpenBSD: ssl_privsep.c,v 1.5 2013/01/26 09:37:24 gilles Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
diff --git a/smtpd/ssl_smtpd.c b/smtpd/ssl_smtpd.c
index 110dea0a..e1cea87e 100644
--- a/smtpd/ssl_smtpd.c
+++ b/smtpd/ssl_smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: ssl_smtpd.c,v 1.1 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
diff --git a/smtpd/table.c b/smtpd/table.c
index 863b9f7b..3f8f14e3 100644
--- a/smtpd/table.c
+++ b/smtpd/table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: map.c,v 1.35 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: table.c,v 1.1 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/table_db.c b/smtpd/table_db.c
index d1844441..0688f23b 100644
--- a/smtpd/table_db.c
+++ b/smtpd/table_db.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: map_db.c,v 1.12 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: table_db.c,v 1.1 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/table_getpwnam.c b/smtpd/table_getpwnam.c
index 02b8b17d..25c2cbf3 100644
--- a/smtpd/table_getpwnam.c
+++ b/smtpd/table_getpwnam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: table_getpwnam.c,v 1.1 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/table_sqlite.c b/smtpd/table_sqlite.c
index e05a189d..0d506c21 100644
--- a/smtpd/table_sqlite.c
+++ b/smtpd/table_sqlite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: table_sqlite.c,v 1.1 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/table_static.c b/smtpd/table_static.c
index 15482994..e9b7dd72 100644
--- a/smtpd/table_static.c
+++ b/smtpd/table_static.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: map_static.c,v 1.9 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: table_static.c,v 1.1 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
diff --git a/smtpd/tree.c b/smtpd/tree.c
index fe83d333..e972839b 100644
--- a/smtpd/tree.c
+++ b/smtpd/tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.c,v 1.1 2012/08/07 21:47:58 eric Exp $ */
+/* $OpenBSD: tree.c,v 1.3 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
diff --git a/smtpd/util.c b/smtpd/util.c
index 65ddd883..1586513e 100644
--- a/smtpd/util.c
+++ b/smtpd/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.88 2012/11/12 14:58:53 eric Exp $ */
+/* $OpenBSD: util.c,v 1.90 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2000,2001 Markus Friedl. All rights reserved.
diff --git a/smtpd/waitq.c b/smtpd/waitq.c
index eefc990c..9adbaa98 100644
--- a/smtpd/waitq.c
+++ b/smtpd/waitq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: waitq.c,v 1.1 2012/10/07 17:21:37 eric Exp $ */
+/* $OpenBSD: waitq.c,v 1.3 2013/01/26 09:37:24 gilles Exp $ */
/*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org>