From 799c9944fa8bbbc14aab0bb61b58d2823678bc31 Mon Sep 17 00:00:00 2001
From: Philip Guenthe <guenther@cvs.openbsd.org>
Date: Tue, 16 Dec 2008 05:25:56 +0000
Subject: strptime() never sets tm_isdst, so set it to -1 before passing the
 struct tm to mktime() so that the calculation will follow the local DST rules

ok millert@ otto@
---
 usr.sbin/user/user.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr.sbin/user')

diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c
index 34397055e70..712e6c2c28a 100644
--- a/usr.sbin/user/user.c
+++ b/usr.sbin/user/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.73 2008/10/09 21:10:08 miod Exp $ */
+/* $OpenBSD: user.c,v 1.74 2008/12/16 05:25:55 guenther Exp $ */
 /* $NetBSD: user.c,v 1.69 2003/04/14 17:40:07 agc Exp $ */
 
 /*
@@ -911,6 +911,7 @@ scantime(time_t *tp, char *s)
 	*tp = 0;
 	if (s != NULL) {
 		(void) memset(&tm, 0, sizeof(tm));
+		tm.tm_isdst = -1;
 		if (strptime(s, "%c", &tm) != NULL) {
 			*tp = mktime(&tm);
 		} else if (strptime(s, "%B %d %Y", &tm) != NULL) {
-- 
cgit v1.2.3