diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /loginrec.c | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'loginrec.c')
-rw-r--r-- | loginrec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/loginrec.c b/loginrec.c index c3783c991..d096346ec 100644 --- a/loginrec.c +++ b/loginrec.c | |||
@@ -165,7 +165,7 @@ | |||
165 | # include <libutil.h> | 165 | # include <libutil.h> |
166 | #endif | 166 | #endif |
167 | 167 | ||
168 | RCSID("$Id: loginrec.c,v 1.70 2005/07/17 07:26:44 djm Exp $"); | 168 | RCSID("$Id: loginrec.c,v 1.71 2005/11/22 08:55:13 dtucker Exp $"); |
169 | 169 | ||
170 | /** | 170 | /** |
171 | ** prototypes for helper functions in this file | 171 | ** prototypes for helper functions in this file |
@@ -1589,7 +1589,7 @@ lastlog_get_entry(struct logininfo *li) | |||
1589 | return (0); | 1589 | return (0); |
1590 | default: | 1590 | default: |
1591 | error("%s: Error reading from %s: Expecting %d, got %d", | 1591 | error("%s: Error reading from %s: Expecting %d, got %d", |
1592 | __func__, LASTLOG_FILE, sizeof(last), ret); | 1592 | __func__, LASTLOG_FILE, (int)sizeof(last), ret); |
1593 | return (0); | 1593 | return (0); |
1594 | } | 1594 | } |
1595 | 1595 | ||
@@ -1613,7 +1613,7 @@ record_failed_login(const char *username, const char *hostname, | |||
1613 | int fd; | 1613 | int fd; |
1614 | struct utmp ut; | 1614 | struct utmp ut; |
1615 | struct sockaddr_storage from; | 1615 | struct sockaddr_storage from; |
1616 | size_t fromlen = sizeof(from); | 1616 | socklen_t fromlen = sizeof(from); |
1617 | struct sockaddr_in *a4; | 1617 | struct sockaddr_in *a4; |
1618 | struct sockaddr_in6 *a6; | 1618 | struct sockaddr_in6 *a6; |
1619 | time_t t; | 1619 | time_t t; |