From efc17470e0548dae4b6ffc34370ad15562d83239 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 22 Nov 2005 19:55:13 +1100 Subject: - (dtucker) [loginrec.c] Add casts to prevent compiler warnings, patch from shaw at vranix.com. --- ChangeLog | 4 +++- loginrec.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d1529e91..1164b770d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,8 @@ [hostfile.c] Correct format/arguments to debug call; spotted by shaw at vranix.com ok djm@ + - (dtucker) [loginrec.c] Add casts to prevent compiler warnings, patch + from shaw at vranix.com. 20051120 - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what @@ -3331,4 +3333,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4001 2005/11/22 08:43:26 dtucker Exp $ +$Id: ChangeLog,v 1.4002 2005/11/22 08:55:13 dtucker Exp $ diff --git a/loginrec.c b/loginrec.c index c3783c991..d096346ec 100644 --- a/loginrec.c +++ b/loginrec.c @@ -165,7 +165,7 @@ # include #endif -RCSID("$Id: loginrec.c,v 1.70 2005/07/17 07:26:44 djm Exp $"); +RCSID("$Id: loginrec.c,v 1.71 2005/11/22 08:55:13 dtucker Exp $"); /** ** prototypes for helper functions in this file @@ -1589,7 +1589,7 @@ lastlog_get_entry(struct logininfo *li) return (0); default: error("%s: Error reading from %s: Expecting %d, got %d", - __func__, LASTLOG_FILE, sizeof(last), ret); + __func__, LASTLOG_FILE, (int)sizeof(last), ret); return (0); } @@ -1613,7 +1613,7 @@ record_failed_login(const char *username, const char *hostname, int fd; struct utmp ut; struct sockaddr_storage from; - size_t fromlen = sizeof(from); + socklen_t fromlen = sizeof(from); struct sockaddr_in *a4; struct sockaddr_in6 *a6; time_t t; -- cgit v1.2.3