diff options
| author | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
| commit | 124c4a14153799ec55cc535db5222b1780208aa1 (patch) | |
| tree | 91bbaf12f7d9b9158ae725f996c95f18038af40c /crypto/openssh/loginrec.c | |
| parent | 1754c77e5e8ce4ec5f746dc5ce34e4cb54e3130f (diff) | |
| download | FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.zip FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/loginrec.c')
| -rw-r--r-- | crypto/openssh/loginrec.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crypto/openssh/loginrec.c b/crypto/openssh/loginrec.c index 80a4f7f..da69da3 100644 --- a/crypto/openssh/loginrec.c +++ b/crypto/openssh/loginrec.c @@ -158,7 +158,7 @@ #include "log.h" #include "atomicio.h" -RCSID("$Id: loginrec.c,v 1.52 2003/07/06 05:20:46 dtucker Exp $"); +RCSID("$Id: loginrec.c,v 1.54 2004/02/10 05:49:35 dtucker Exp $"); RCSID("$FreeBSD$"); #ifdef HAVE_UTIL_H @@ -443,7 +443,7 @@ login_write (struct logininfo *li) int login_utmp_only(struct logininfo *li) { - li->type = LTYPE_LOGIN; + li->type = LTYPE_LOGIN; login_set_current_time(li); # ifdef USE_UTMP utmp_write_entry(li); @@ -1185,6 +1185,7 @@ wtmp_get_entry(struct logininfo *li) static int wtmpx_write(struct logininfo *li, struct utmpx *utx) { +#ifndef HAVE_UPDWTMPX struct stat buf; int fd, ret = 1; @@ -1204,6 +1205,10 @@ wtmpx_write(struct logininfo *li, struct utmpx *utx) (void)close(fd); return ret; +#else + updwtmpx(WTMPX_FILE, utx); + return 1; +#endif } @@ -1536,7 +1541,7 @@ lastlog_get_entry(struct logininfo *li) lastlog_populate_entry(li, &last); return (1); case -1: - error("%s: Error reading from %s: %s", __func__, + error("%s: Error reading from %s: %s", __func__, LASTLOG_FILE, strerror(errno)); return (0); default: |
