sync with OpenBSD:opensmtpd-201605221710

- use temporary variables to reduce changeset with portable

2 files changed, 98 insertions, 93 deletions

diff --git a/smtpd/CVS/Entries b/smtpd/CVS/Entries
index a1f76e2b..9ebc3e15 100644
--- a/smtpd/CVS/Entries
+++ b/smtpd/CVS/Entries
@@ -1,90 +1,90 @@
 D/smtpctl////
 D/smtpd////
-/Makefile/1.15/Sun May  8 15:40:28 2016//
-/aliases.5/1.12/Sun May  8 15:40:28 2016//
-/forward.5/1.9/Sun May  8 15:40:28 2016//
-/iobuf.h/1.4/Sun May  8 15:40:28 2016//
-/ioev.h/1.6/Sun May  8 16:37:15 2016//
-/makemap.8/1.29/Sun May  8 15:40:28 2016//
-/newaliases.8/1.11/Sun May  8 15:40:28 2016//
-/parser.h/1.29/Sun May  8 15:40:28 2016//
-/rfc2822.h/1.4/Sun May  8 15:40:28 2016//
-/sendmail.8/1.4/Sun May  8 15:40:28 2016//
-/smtpctl.8/1.55/Sun May  8 16:37:15 2016//
-/smtpd-api.h/1.29/Sun May  8 15:40:28 2016//
-/smtpd.8/1.30/Sun May  8 16:37:15 2016//
-/table.5/1.5/Sun May  8 15:40:28 2016//
-/aliases.c/1.70/Sat May 21 19:29:14 2016//
-/bounce.c/1.72/Sat May 21 17:46:36 2016//
-/ca.c/1.21/Sat May 21 17:46:36 2016//
-/compress_backend.c/1.9/Sat May 21 17:46:36 2016//
-/compress_gzip.c/1.10/Sat May 21 17:46:36 2016//
-/config.c/1.34/Sat May 21 17:46:36 2016//
-/control.c/1.112/Sat May 21 17:46:36 2016//
-/crypto.c/1.5/Sat May 21 17:46:36 2016//
-/delivery.c/1.6/Sat May 21 17:46:36 2016//
-/delivery_filename.c/1.14/Sat May 21 17:46:36 2016//
-/delivery_lmtp.c/1.15/Sat May 21 17:46:36 2016//
-/delivery_maildir.c/1.17/Sat May 21 17:46:36 2016//
-/delivery_mbox.c/1.12/Sat May 21 17:46:36 2016//
-/delivery_mda.c/1.9/Sat May 21 17:46:36 2016//
-/dict.c/1.5/Sat May 21 17:46:36 2016//
-/dns.c/1.83/Sat May 21 17:46:36 2016//
-/enqueue.c/1.112/Sat May 21 17:46:36 2016//
-/envelope.c/1.36/Sat May 21 17:46:36 2016//
-/esc.c/1.4/Sat May 21 17:46:36 2016//
-/expand.c/1.29/Sat May 21 17:46:36 2016//
-/filter.c/1.18/Sat May 21 17:46:36 2016//
-/forward.c/1.39/Sat May 21 17:46:36 2016//
-/iobuf.c/1.9/Sat May 21 17:46:36 2016//
-/ioev.c/1.26/Sat May 21 19:29:14 2016//
-/limit.c/1.4/Sat May 21 17:46:36 2016//
-/lka.c/1.192/Sat May 21 17:46:36 2016//
-/lka_session.c/1.79/Sat May 21 17:46:36 2016//
-/log.c/1.17/Sat May 21 17:46:36 2016//
-/log.h/1.5/Sat May 21 17:46:36 2016//
-/mailaddr.c/1.2/Sat May 21 17:46:36 2016//
-/makemap.c/1.65/Sat May 21 17:46:36 2016//
-/mda.c/1.118/Sat May 21 17:46:36 2016//
-/mproc.c/1.19/Sat May 21 17:46:36 2016//
-/mta.c/1.200/Sat May 21 17:46:36 2016//
-/mta_session.c/1.82/Sat May 21 17:46:36 2016//
-/parse.y/1.184/Sat May 21 17:46:36 2016//
-/parser.c/1.40/Sat May 21 17:46:36 2016//
-/pony.c/1.12/Sat May 21 17:46:36 2016//
-/queue.c/1.177/Sat May 21 17:46:36 2016//
-/queue_backend.c/1.62/Sat May 21 17:46:36 2016//
-/queue_fs.c/1.14/Sat May 21 17:46:36 2016//
-/queue_null.c/1.6/Sat May 21 17:46:36 2016//
-/queue_proc.c/1.6/Sat May 21 17:46:36 2016//
-/queue_ram.c/1.7/Sat May 21 17:46:36 2016//
-/rfc2822.c/1.7/Sat May 21 17:46:36 2016//
-/ruleset.c/1.32/Sat May 21 17:46:36 2016//
-/runq.c/1.2/Sat May 21 17:46:36 2016//
-/scheduler.c/1.51/Sat May 21 17:46:36 2016//
-/scheduler_backend.c/1.15/Sat May 21 17:46:36 2016//
-/scheduler_null.c/1.9/Sat May 21 17:46:36 2016//
-/scheduler_proc.c/1.8/Sat May 21 17:46:36 2016//
-/scheduler_ramqueue.c/1.42/Sat May 21 17:46:36 2016//
-/smtp.c/1.155/Sat May 21 17:46:36 2016//
-/smtp_session.c/1.271/Sat May 21 17:46:36 2016//
-/smtpctl.c/1.149/Sat May 21 18:44:07 2016//
-/smtpd-defines.h/1.6/Sat May 21 17:46:36 2016//
-/smtpd.c/1.276/Sat May 21 17:46:36 2016//
-/smtpd.conf.5/1.161/Sat May 21 19:29:15 2016//
-/smtpd.h/1.514/Sat May 21 17:46:36 2016//
-/ssl.c/1.86/Sat May 21 17:46:36 2016//
-/ssl.h/1.20/Sat May 21 17:46:36 2016//
-/ssl_smtpd.c/1.13/Sat May 21 17:46:36 2016//
-/stat_backend.c/1.10/Sat May 21 17:46:36 2016//
-/stat_ramstat.c/1.10/Sat May 21 17:46:36 2016//
-/table.c/1.23/Sat May 21 17:46:36 2016//
-/table_api.c/1.8/Sat May 21 17:46:36 2016//
-/table_db.c/1.9/Sat May 21 17:46:36 2016//
-/table_getpwnam.c/1.4/Sat May 21 17:46:36 2016//
-/table_proc.c/1.6/Sat May 21 17:46:36 2016//
-/table_static.c/1.15/Sat May 21 17:46:36 2016//
-/to.c/1.26/Sat May 21 17:46:36 2016//
-/tree.c/1.5/Sat May 21 17:46:36 2016//
-/util.c/1.127/Sat May 21 17:46:36 2016//
-/waitq.c/1.5/Sat May 21 17:46:36 2016//
+/Makefile/1.15/Mon Mar  7 16:27:28 2016//
+/aliases.5/1.12/Mon Mar  7 16:27:28 2016//
+/aliases.c/1.70/Sun May 22 11:15:48 2016//
+/bounce.c/1.72/Wed May 18 07:36:31 2016//
+/ca.c/1.21/Wed May 18 07:36:31 2016//
+/compress_backend.c/1.9/Wed May 18 07:36:31 2016//
+/compress_gzip.c/1.10/Wed May 18 07:36:31 2016//
+/config.c/1.34/Wed May 18 07:36:31 2016//
+/control.c/1.112/Wed May 18 07:36:31 2016//
+/crypto.c/1.5/Wed May 18 07:36:31 2016//
+/delivery.c/1.6/Wed May 18 07:36:31 2016//
+/delivery_filename.c/1.14/Wed May 18 07:36:31 2016//
+/delivery_lmtp.c/1.15/Wed May 18 07:36:31 2016//
+/delivery_maildir.c/1.17/Wed May 18 07:36:31 2016//
+/delivery_mbox.c/1.12/Wed May 18 07:36:31 2016//
+/delivery_mda.c/1.9/Wed May 18 07:36:31 2016//
+/dict.c/1.5/Wed May 18 07:36:31 2016//
+/dns.c/1.83/Wed May 18 07:36:31 2016//
+/enqueue.c/1.112/Wed May 18 07:36:31 2016//
+/envelope.c/1.36/Wed May 18 07:36:31 2016//
+/esc.c/1.4/Wed May 18 07:36:31 2016//
+/expand.c/1.29/Wed May 18 07:36:31 2016//
+/filter.c/1.18/Sun May 22 11:15:48 2016//
+/forward.5/1.9/Mon Mar  7 16:27:28 2016//
+/forward.c/1.39/Wed May 18 07:36:31 2016//
+/iobuf.c/1.9/Wed May 18 07:36:31 2016//
+/iobuf.h/1.4/Mon Mar  7 16:27:28 2016//
+/ioev.c/1.26/Sun May 22 11:15:48 2016//
+/ioev.h/1.6/Wed May 18 07:36:31 2016//
+/limit.c/1.4/Wed May 18 07:36:31 2016//
+/lka.c/1.192/Wed May 18 07:36:31 2016//
+/lka_session.c/1.79/Wed May 18 07:36:31 2016//
+/log.c/1.17/Wed May 18 07:36:31 2016//
+/log.h/1.5/Wed May 18 07:36:31 2016//
+/mailaddr.c/1.2/Wed May 18 07:36:31 2016//
+/makemap.8/1.29/Mon Mar  7 16:27:28 2016//
+/makemap.c/1.65/Wed May 18 07:36:31 2016//
+/mda.c/1.118/Wed May 18 07:36:31 2016//
+/mproc.c/1.19/Wed May 18 07:36:31 2016//
+/mta.c/1.200/Wed May 18 07:36:31 2016//
+/mta_session.c/1.82/Wed May 18 07:36:31 2016//
+/newaliases.8/1.11/Mon Mar  7 16:27:28 2016//
+/parse.y/1.184/Wed May 18 07:36:31 2016//
+/parser.c/1.40/Wed May 18 07:36:31 2016//
+/parser.h/1.29/Mon Mar  7 16:27:28 2016//
+/pony.c/1.12/Wed May 18 07:36:31 2016//
+/queue.c/1.177/Wed May 18 07:36:31 2016//
+/queue_backend.c/1.62/Wed May 18 07:36:31 2016//
+/queue_fs.c/1.14/Wed May 18 07:36:31 2016//
+/queue_null.c/1.6/Wed May 18 07:36:31 2016//
+/queue_proc.c/1.6/Wed May 18 07:36:31 2016//
+/queue_ram.c/1.7/Wed May 18 07:36:31 2016//
+/rfc2822.c/1.7/Wed May 18 07:36:31 2016//
+/rfc2822.h/1.4/Mon Mar  7 16:27:28 2016//
+/ruleset.c/1.32/Wed May 18 07:36:31 2016//
+/runq.c/1.2/Wed May 18 07:36:31 2016//
+/scheduler.c/1.51/Wed May 18 07:36:31 2016//
+/scheduler_backend.c/1.15/Wed May 18 07:36:31 2016//
+/scheduler_null.c/1.9/Wed May 18 07:36:31 2016//
+/scheduler_proc.c/1.8/Wed May 18 07:36:31 2016//
+/scheduler_ramqueue.c/1.42/Wed May 18 07:36:31 2016//
+/sendmail.8/1.4/Mon Mar  7 16:27:28 2016//
+/smtp.c/1.155/Wed May 18 07:36:31 2016//
+/smtp_session.c/1.271/Sun May 22 11:15:48 2016//
+/smtpctl.8/1.55/Wed May 18 07:36:31 2016//
+/smtpctl.c/1.149/Wed May 18 07:36:31 2016//
+/smtpd-api.h/1.29/Mon Mar  7 16:27:28 2016//
+/smtpd-defines.h/1.6/Wed May 18 07:36:31 2016//
+/smtpd.8/1.30/Wed May 18 07:36:31 2016//
+/smtpd.c/1.276/Wed May 18 07:36:31 2016//
+/smtpd.conf.5/1.161/Sun May 22 11:15:48 2016//
+/smtpd.h/1.514/Wed May 18 07:36:31 2016//
+/ssl.c/1.86/Wed May 18 07:36:31 2016//
+/ssl.h/1.20/Wed May 18 07:36:31 2016//
+/ssl_smtpd.c/1.13/Wed May 18 07:36:31 2016//
+/stat_backend.c/1.10/Wed May 18 07:36:31 2016//
+/stat_ramstat.c/1.10/Wed May 18 07:36:31 2016//
+/table.5/1.5/Mon Mar  7 16:27:28 2016//
+/table.c/1.23/Wed May 18 07:36:31 2016//
+/table_api.c/1.8/Wed May 18 07:36:31 2016//
+/table_db.c/1.9/Wed May 18 07:36:31 2016//
+/table_getpwnam.c/1.4/Wed May 18 07:36:31 2016//
+/table_proc.c/1.6/Wed May 18 07:36:31 2016//
+/table_static.c/1.15/Wed May 18 07:36:31 2016//
+/to.c/1.27/Sun May 22 11:16:10 2016//
+/tree.c/1.5/Wed May 18 07:36:31 2016//
+/util.c/1.127/Sun May 22 11:15:48 2016//
+/waitq.c/1.5/Wed May 18 07:36:31 2016//
diff --git a/smtpd/to.c b/smtpd/to.c
index 5cc2da51..f8724203 100644
--- a/smtpd/to.c
+++ b/smtpd/to.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: to.c,v 1.26 2016/02/15 12:53:50 mpi Exp $	*/
+/*	$OpenBSD: to.c,v 1.27 2016/05/22 11:15:31 gilles Exp $	*/
 
 /*
  * Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -194,21 +194,26 @@ time_to_text(time_t when)
 	char *day[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
 	char *month[] = {"Jan","Feb","Mar","Apr","May","Jun",
 			 "Jul","Aug","Sep","Oct","Nov","Dec"};
+	char *tz;
+	long offset;
 
 	lt = localtime(&when);
 	if (lt == NULL || when == 0)
 		fatalx("time_to_text: localtime");
 
+	offset = lt->tm_gmtoff;
+	tz = lt->tm_zone;
+
 	/* We do not use strftime because it is subject to locale substitution*/
 	if (!bsnprintf(buf, sizeof(buf),
 	    "%s, %d %s %d %02d:%02d:%02d %c%02d%02d (%s)",
 	    day[lt->tm_wday], lt->tm_mday, month[lt->tm_mon],
 	    lt->tm_year + 1900,
 	    lt->tm_hour, lt->tm_min, lt->tm_sec,
-	    lt->tm_gmtoff >= 0 ? '+' : '-',
-	    abs((int)lt->tm_gmtoff / 3600),
-	    abs((int)lt->tm_gmtoff % 3600) / 60,
-	    lt->tm_zone))
+	    offset >= 0 ? '+' : '-',
+	    abs((int)offset / 3600),
+	    abs((int)offset % 3600) / 60,
+	    tz))
 		fatalx("time_to_text: bsnprintf");
 
 	return buf;