From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 17 Jan 2014 01:23:23 +0000 (+1100)
Subject:  - (dtucker) [loginrec.c] Cast to the types specfied in the format
X-Git-Tag: V_6_5_P1~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c4a011e9c939e74815346a560843e1862c300b8;p=thirdparty%2Fopenssh-portable.git

 - (dtucker) [loginrec.c] Cast to the types specfied in the format
    specification to prevent warnings.
---

diff --git a/ChangeLog b/ChangeLog
index ada012fb8..14098dbcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    if the toolchain supports them, but there is a configure-time knob
    (--without-hardening) to disable them if necessary.  ok djm@
  - (djm) [sftp-client.c] signed/unsigned comparison fix
+ - (dtucker) [loginrec.c] Cast to the types specfied in the format
+    specification to prevent warnings.
 
 20140118
  - (djm) OpenBSD CVS Sync
diff --git a/loginrec.c b/loginrec.c
index 8844db540..4219b9aef 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -313,7 +313,8 @@ login_get_lastlog(struct logininfo *li, const uid_t uid)
 	if (strlcpy(li->username, pw->pw_name, sizeof(li->username)) >=
 	    sizeof(li->username)) {
 		error("%s: username too long (%lu > max %lu)", __func__,
-		    strlen(pw->pw_name), sizeof(li->username) - 1);
+		    (unsigned long)strlen(pw->pw_name),
+		    (unsigned long)sizeof(li->username) - 1);
 		return NULL;
 	}