merged OPENSSH_3_8P1_GSSAPI_20040304 to gpt-branch

[gssapi-openssh.git] / openssh / loginrec.c

diff --git a/openssh/loginrec.c b/openssh/loginrec.c
index 8a7092b29d33ef63b38645f18467a6d96e05e540..d975443f000c33960c856233b0eaca29b94e935c 100644 (file)
--- a/openssh/loginrec.c
+++ b/openssh/loginrec.c
@@ -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: