diff options
author | des <des@FreeBSD.org> | 2010-04-28 10:36:33 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2010-04-28 10:36:33 +0000 |
commit | fc607a2e80dfeb125ae2fe83191d934929997047 (patch) | |
tree | bd00e72572bcfba5ac7d243462c79d29a987c5a2 /crypto/openssh/loginrec.c | |
parent | c86e821ecb2a324088edbbb87198b4d55833575a (diff) | |
download | FreeBSD-src-fc607a2e80dfeb125ae2fe83191d934929997047.zip FreeBSD-src-fc607a2e80dfeb125ae2fe83191d934929997047.tar.gz |
Upgrade to OpenSSH 5.5p1.
Diffstat (limited to 'crypto/openssh/loginrec.c')
-rw-r--r-- | crypto/openssh/loginrec.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/openssh/loginrec.c b/crypto/openssh/loginrec.c index e6eaf0b..62962ac 100644 --- a/crypto/openssh/loginrec.c +++ b/crypto/openssh/loginrec.c @@ -510,6 +510,10 @@ getlast_entry(struct logininfo *li) #ifdef USE_LASTLOG return(lastlog_get_entry(li)); #else /* !USE_LASTLOG */ +#if defined(USE_UTMPX) && defined(HAVE_SETUTXDB) && \ + defined(UTXDB_LASTLOGIN) && defined(HAVE_GETUTXUSER) + return (utmpx_get_entry(li)); +#endif #if 1 return (utmpx_get_entry(li)); @@ -1614,7 +1618,8 @@ lastlog_get_entry(struct logininfo *li) #endif /* HAVE_GETLASTLOGXBYNAME */ #endif /* USE_LASTLOG */ -#if 1 +#if defined(USE_UTMPX) && defined(HAVE_SETUTXDB) && \ + defined(UTXDB_LASTLOGIN) && defined(HAVE_GETUTXUSER) int utmpx_get_entry(struct logininfo *li) { @@ -1637,7 +1642,7 @@ utmpx_get_entry(struct logininfo *li) endutxent(); return (1); } -#endif +#endif /* USE_UTMPX && HAVE_SETUTXDB && UTXDB_LASTLOGIN && HAVE_GETUTXUSER */ #ifdef USE_BTMP /* |