- (djm) Bug #406: s/msg_send/ssh_msg_send/ for Mac OS X 1.2

[openssh.git] / loginrec.c

diff --git a/loginrec.c b/loginrec.c
index 1805f3ee836ec1f67f543c5687fda0cd801b6364..0c4ceddc1d9e40831cc485872337f267bd1e67f8 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -564,6 +564,11 @@ line_abbrevname(char *dst, const char *src, int dstsize)
        if (strncmp(src, "/dev/", 5) == 0)
                src += 5;
 
+#ifdef WITH_ABBREV_NO_TTY
+       if (strncmp(src, "tty", 3) == 0)
+               src += 3;
+#endif
+
        len = strlen(src);
 
        if (len > 0) {
@@ -617,13 +622,13 @@ construct_utmp(struct logininfo *li,
        switch (li->type) {
        case LTYPE_LOGIN:
                ut->ut_type = USER_PROCESS;
-#ifdef _CRAY
+#ifdef _UNICOS
                cray_set_tmpdir(ut);
 #endif
                break;
        case LTYPE_LOGOUT:
                ut->ut_type = DEAD_PROCESS;
-#ifdef _CRAY
+#ifdef _UNICOS
                cray_retain_utmp(ut, li->pid);
 #endif
                break;
@@ -1244,7 +1249,7 @@ wtmpx_get_entry(struct logininfo *li)
        }
        if (fstat(fd, &st) != 0) {
                log("wtmpx_get_entry: couldn't stat %s: %s",
-                   WTMP_FILE, strerror(errno));
+                   WTMPX_FILE, strerror(errno));
                close(fd);
                return 0;
        }
@@ -1266,6 +1271,7 @@ wtmpx_get_entry(struct logininfo *li)
                /* Logouts are recorded as a blank username on a particular line.
                 * So, we just need to find the username in struct utmpx */
                if ( wtmpx_islogin(li, &utx) ) {
+                       found = 1;
 # ifdef HAVE_TV_IN_UTMPX
                        li->tv_sec = utx.ut_tv.tv_sec;
 # else