summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--loginrec.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ada012fb8..14098dbcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 if the toolchain supports them, but there is a configure-time knob 4 if the toolchain supports them, but there is a configure-time knob
5 (--without-hardening) to disable them if necessary. ok djm@ 5 (--without-hardening) to disable them if necessary. ok djm@
6 - (djm) [sftp-client.c] signed/unsigned comparison fix 6 - (djm) [sftp-client.c] signed/unsigned comparison fix
7 - (dtucker) [loginrec.c] Cast to the types specfied in the format
8 specification to prevent warnings.
7 9
820140118 1020140118
9 - (djm) OpenBSD CVS Sync 11 - (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)
313 if (strlcpy(li->username, pw->pw_name, sizeof(li->username)) >= 313 if (strlcpy(li->username, pw->pw_name, sizeof(li->username)) >=
314 sizeof(li->username)) { 314 sizeof(li->username)) {
315 error("%s: username too long (%lu > max %lu)", __func__, 315 error("%s: username too long (%lu > max %lu)", __func__,
316 strlen(pw->pw_name), sizeof(li->username) - 1); 316 (unsigned long)strlen(pw->pw_name),
317 (unsigned long)sizeof(li->username) - 1);
317 return NULL; 318 return NULL;
318 } 319 }
319 320