Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 8 insertions, 3 deletions

diff --git a/loginrec.c b/loginrec.c
index bdac3e959..71dbaea15 100644
--- a/loginrec.c
+++ b/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 $");
 
 #ifdef HAVE_UTIL_H
 #  include <util.h>
@@ -442,7 +442,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);
@@ -1183,6 +1183,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;
 
@@ -1202,6 +1203,10 @@ wtmpx_write(struct logininfo *li, struct utmpx *utx)
         (void)close(fd);
 
         return ret;
+#else
+        updwtmpx(WTMPX_FILE, utx);
+        return 1;
+#endif
 }
 
 
@@ -1534,7 +1539,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: