summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac4
-rw-r--r--loginrec.c7
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ac0ce1ac..62090549d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
13 - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Move 13 - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Move
14 include from port-aix.h to port-aix.c and remove unnecessary function 14 include from port-aix.h to port-aix.c and remove unnecessary function
15 definition. Fixes build errors on AIX. 15 definition. Fixes build errors on AIX.
16 - (dtucker) [configure.ac loginrec.c] Bug #464: Use updwtmpx on platforms
17 that support it. from & ok mouring@
16 18
1720040207 1920040207
18 - (dtucker) OpenBSD CVS Sync 20 - (dtucker) OpenBSD CVS Sync
@@ -1836,4 +1838,4 @@
1836 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1838 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1837 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1839 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1838 1840
1839$Id: ChangeLog,v 1.3222 2004/02/10 04:27:34 dtucker Exp $ 1841$Id: ChangeLog,v 1.3223 2004/02/10 05:49:35 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index bdff63db3..5ecbf56db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.194 2004/02/06 10:29:42 dtucker Exp $ 1# $Id: configure.ac,v 1.195 2004/02/10 05:49:35 dtucker Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -801,7 +801,7 @@ AC_CHECK_FUNCS(\
801 setproctitle setregid setreuid setrlimit \ 801 setproctitle setregid setreuid setrlimit \
802 setsid setvbuf sigaction sigvec snprintf socketpair strerror \ 802 setsid setvbuf sigaction sigvec snprintf socketpair strerror \
803 strlcat strlcpy strmode strnvis strtoul sysconf tcgetpgrp \ 803 strlcat strlcpy strmode strnvis strtoul sysconf tcgetpgrp \
804 truncate utimes vhangup vsnprintf waitpid \ 804 truncate updwtmpx utimes vhangup vsnprintf waitpid \
805) 805)
806 806
807# IRIX has a const char return value for gai_strerror() 807# IRIX has a const char return value for gai_strerror()
diff --git a/loginrec.c b/loginrec.c
index ce9e26fc5..71dbaea15 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -158,7 +158,7 @@
158#include "log.h" 158#include "log.h"
159#include "atomicio.h" 159#include "atomicio.h"
160 160
161RCSID("$Id: loginrec.c,v 1.53 2003/11/21 12:48:55 djm Exp $"); 161RCSID("$Id: loginrec.c,v 1.54 2004/02/10 05:49:35 dtucker Exp $");
162 162
163#ifdef HAVE_UTIL_H 163#ifdef HAVE_UTIL_H
164# include <util.h> 164# include <util.h>
@@ -1183,6 +1183,7 @@ wtmp_get_entry(struct logininfo *li)
1183static int 1183static int
1184wtmpx_write(struct logininfo *li, struct utmpx *utx) 1184wtmpx_write(struct logininfo *li, struct utmpx *utx)
1185{ 1185{
1186#ifndef HAVE_UPDWTMPX
1186 struct stat buf; 1187 struct stat buf;
1187 int fd, ret = 1; 1188 int fd, ret = 1;
1188 1189
@@ -1202,6 +1203,10 @@ wtmpx_write(struct logininfo *li, struct utmpx *utx)
1202 (void)close(fd); 1203 (void)close(fd);
1203 1204
1204 return ret; 1205 return ret;
1206#else
1207 updwtmpx(WTMPX_FILE, utx);
1208 return 1;
1209#endif
1205} 1210}
1206 1211
1207 1212