[openssh-commits] [openssh] 06/20: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit f101d8291da01bbbfd6fb8c569cfd0cc61c0d346
Author: deraadt at openbsd.org <deraadt at openbsd.org>
Date:   Sun Jan 18 14:01:00 2015 +0000

    upstream commit
    
    string truncation due to sizeof(size) ok djm markus
---
 krl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/krl.c b/krl.c
index 3917338..721cabd 100644
--- a/krl.c
+++ b/krl.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $OpenBSD: krl.c,v 1.26 2015/01/14 15:02:39 djm Exp $ */
+/* $OpenBSD: krl.c,v 1.27 2015/01/18 14:01:00 deraadt Exp $ */
 
 #include "includes.h"
 
@@ -793,7 +793,7 @@ format_timestamp(u_int64_t timestamp, char *ts, size_t nts)
 	t = timestamp;
 	tm = localtime(&t);
 	if (tm == NULL)
-		strlcpy(ts, "<INVALID>", sizeof(nts));
+		strlcpy(ts, "<INVALID>", nts);
 	else {
 		*ts = '\0';
 		strftime(ts, nts, "%Y%m%dT%H%M%S", tm);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.