patch from matthieu hautreux for cascading credentials

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

diff --git a/openssh/loginrec.c b/openssh/loginrec.c
index 2d3d73ed034a0255fe2c7bb188122f0729d3d54a..87c336df082200b7fbdee95c88529858528617b9 100644 (file)
--- a/openssh/loginrec.c
+++ b/openssh/loginrec.c
@@ -564,11 +564,6 @@ 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) {
@@ -609,9 +604,6 @@ void
 construct_utmp(struct logininfo *li,
                    struct utmp *ut)
 {
-# ifdef HAVE_ADDR_V6_IN_UTMP
-       struct sockaddr_in6 *sa6;
-#  endif
        memset(ut, '\0', sizeof(*ut));
 
        /* First fill out fields used for both logins and logouts */
@@ -625,13 +617,13 @@ construct_utmp(struct logininfo *li,
        switch (li->type) {
        case LTYPE_LOGIN:
                ut->ut_type = USER_PROCESS;
-#ifdef _UNICOS
+#ifdef _CRAY
                cray_set_tmpdir(ut);
 #endif
                break;
        case LTYPE_LOGOUT:
                ut->ut_type = DEAD_PROCESS;
-#ifdef _UNICOS
+#ifdef _CRAY
                cray_retain_utmp(ut, li->pid);
 #endif
                break;
@@ -664,19 +656,6 @@ construct_utmp(struct logininfo *li,
        if (li->hostaddr.sa.sa_family == AF_INET)
                ut->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
 # endif
-# ifdef HAVE_ADDR_V6_IN_UTMP
-       /* this is just a 128-bit IPv6 address */
-       if (li->hostaddr.sa.sa_family == AF_INET6) {
-               sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
-               memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
-               if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
-                       ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
-                       ut->ut_addr_v6[1] = 0;
-                       ut->ut_addr_v6[2] = 0;
-                       ut->ut_addr_v6[3] = 0;
-               }
-       }
-# endif
 }
 #endif /* USE_UTMP || USE_WTMP || USE_LOGIN */
 
@@ -705,9 +684,6 @@ set_utmpx_time(struct logininfo *li, struct utmpx *utx)
 void
 construct_utmpx(struct logininfo *li, struct utmpx *utx)
 {
-# ifdef HAVE_ADDR_V6_IN_UTMP
-       struct sockaddr_in6 *sa6;
-#  endif
        memset(utx, '\0', sizeof(*utx));
 # ifdef HAVE_ID_IN_UTMPX
        line_abbrevname(utx->ut_id, li->line, sizeof(utx->ut_id));
@@ -725,8 +701,6 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
        line_stripname(utx->ut_line, li->line, sizeof(utx->ut_line));
        set_utmpx_time(li, utx);
        utx->ut_pid = li->pid;
-       /* strncpy(): Don't necessarily want null termination */
-       strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username));
 
        if (li->type == LTYPE_LOGOUT)
                return;
@@ -736,6 +710,8 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
         * for logouts.
         */
 
+       /* strncpy(): Don't necessarily want null termination */
+       strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username));
 # ifdef HAVE_HOST_IN_UTMPX
        strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname));
 # endif
@@ -744,19 +720,6 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
        if (li->hostaddr.sa.sa_family == AF_INET)
                utx->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
 # endif
-# ifdef HAVE_ADDR_V6_IN_UTMP
-       /* this is just a 128-bit IPv6 address */
-       if (li->hostaddr.sa.sa_family == AF_INET6) {
-               sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
-               memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
-               if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
-                       ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
-                       ut->ut_addr_v6[1] = 0;
-                       ut->ut_addr_v6[2] = 0;
-                       ut->ut_addr_v6[3] = 0;
-               }
-       }
-# endif
 # ifdef HAVE_SYSLEN_IN_UTMPX
        /* ut_syslen is the length of the utx_host string */
        utx->ut_syslen = MIN(strlen(li->hostname), sizeof(utx->ut_host));
@@ -979,7 +942,9 @@ utmpx_perform_logout(struct logininfo *li)
 {
        struct utmpx utx;
 
-       construct_utmpx(li, &utx);
+       memset(&utx, '\0', sizeof(utx));
+       set_utmpx_time(li, &utx);
+       line_stripname(utx.ut_line, li->line, sizeof(utx.ut_line));
 # ifdef HAVE_ID_IN_UTMPX
        line_abbrevname(utx.ut_id, li->line, sizeof(utx.ut_id));
 # endif
@@ -1281,7 +1246,7 @@ wtmpx_get_entry(struct logininfo *li)
        }
        if (fstat(fd, &st) != 0) {
                log("wtmpx_get_entry: couldn't stat %s: %s",
-                   WTMPX_FILE, strerror(errno));
+                   WTMP_FILE, strerror(errno));
                close(fd);
                return 0;
        }
@@ -1303,7 +1268,6 @@ 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
@@ -1345,7 +1309,6 @@ syslogin_perform_login(struct logininfo *li)
        }
        construct_utmp(li, ut);
        login(ut);
-       free(ut);
 
        return 1;
 }
@@ -1523,32 +1486,22 @@ int
 lastlog_get_entry(struct logininfo *li)
 {
        struct lastlog last;
-       int fd, ret;
+       int fd;
 
        if (!lastlog_openseek(li, &fd, O_RDONLY))
-               return (0);
-
-       ret = atomicio(read, fd, &last, sizeof(last));
-       close(fd);
+               return 0;
 
-       switch (ret) {
-       case 0:
-               memset(&last, '\0', sizeof(last));
-               /* FALLTHRU */
-       case sizeof(last):
-               lastlog_populate_entry(li, &last);
-               return (1);
-       case -1:
-               error("%s: Error reading from %s: %s", __func__, 
+       if (atomicio(read, fd, &last, sizeof(last)) != sizeof(last)) {
+               close(fd);
+               log("lastlog_get_entry: Error reading from %s: %s",
                    LASTLOG_FILE, strerror(errno));
-               return (0);
-       default:
-               error("%s: Error reading from %s: Expecting %d, got %d",
-                   __func__, LASTLOG_FILE, sizeof(last), ret);
-               return (0);
+               return 0;
        }
 
-       /* NOTREACHED */
-       return (0);
+       close(fd);
+
+       lastlog_populate_entry(li, &last);
+
+       return 1;
 }
 #endif /* USE_LASTLOG */