* New upstream release (closes: #536182). Yes, I know 5.3p1 has been out

  for a while, but there's no GSSAPI patch available for it yet.
  - Change the default cipher order to prefer the AES CTR modes and the
    revised "arcfour256" mode to CBC mode ciphers that are susceptible to
    CPNI-957037 "Plaintext Recovery Attack Against SSH".
  - Add countermeasures to mitigate CPNI-957037-style attacks against the
    SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
    packet length or Message Authentication Code, ssh/sshd will continue
    reading up to the maximum supported packet length rather than
    immediately terminating the connection. This eliminates most of the
    known differences in behaviour that leaked information about the
    plaintext of injected data which formed the basis of this attack
    (closes: #506115, LP: #379329).
  - ForceCommand directive now accepts commandline arguments for the
    internal-sftp server (closes: #524423, LP: #362511).
  - Add AllowAgentForwarding to available Match keywords list (closes:
    #540623).
  - Make ssh(1) send the correct channel number for
    SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
    avoid triggering 'Non-public channel' error messages on sshd(8) in
    openssh-5.1.
  - Avoid printing 'Non-public channel' warnings in sshd(8), since the
    ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
    behaviour introduced in openssh-5.1; closes: #496017).
* Update to GSSAPI patch from
  http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
  including cascading credentials support (LP: #416958).

1 files changed, 66 insertions, 73 deletions

diff --git a/loginrec.c b/loginrec.c
index b41114198..f4af06736 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -1456,25 +1456,14 @@ syslogin_write_entry(struct logininfo *li)
  **/
 
 #ifdef USE_LASTLOG
-#define LL_FILE 1
-#define LL_DIR 2
-#define LL_OTHER 3
-
-static void
-lastlog_construct(struct logininfo *li, struct lastlog *last)
-{
-        /* clear the structure */
-        memset(last, '\0', sizeof(*last));
-
-        line_stripname(last->ll_line, li->line, sizeof(last->ll_line));
-        strlcpy(last->ll_host, li->hostname,
-                MIN_SIZEOF(last->ll_host, li->hostname));
-        last->ll_time = li->tv_sec;
-}
 
+#if !defined(LASTLOG_WRITE_PUTUTXLINE) || !defined(HAVE_GETLASTLOGXBYNAME)
+/* open the file (using filemode) and seek to the login entry */
 static int
-lastlog_filetype(char *filename)
+lastlog_openseek(struct logininfo *li, int *fd, int filemode)
 {
+        off_t offset;
+        char lastlog_file[1024];
         struct stat st;
 
         if (stat(LASTLOG_FILE, &st) != 0) {
@@ -1482,34 +1471,12 @@ lastlog_filetype(char *filename)
                     LASTLOG_FILE, strerror(errno));
                 return (0);
         }
-        if (S_ISDIR(st.st_mode))
-                return (LL_DIR);
-        else if (S_ISREG(st.st_mode))
-                return (LL_FILE);
-        else
-                return (LL_OTHER);
-}
-
-
-/* open the file (using filemode) and seek to the login entry */
-static int
-lastlog_openseek(struct logininfo *li, int *fd, int filemode)
-{
-        off_t offset;
-        int type;
-        char lastlog_file[1024];
-
-        type = lastlog_filetype(LASTLOG_FILE);
-        switch (type) {
-        case LL_FILE:
-                strlcpy(lastlog_file, LASTLOG_FILE,
-                    sizeof(lastlog_file));
-                break;
-        case LL_DIR:
+        if (S_ISDIR(st.st_mode)) {
                 snprintf(lastlog_file, sizeof(lastlog_file), "%s/%s",
                     LASTLOG_FILE, li->username);
-                break;
-        default:
+        } else if (S_ISREG(st.st_mode)) {
+                strlcpy(lastlog_file, LASTLOG_FILE, sizeof(lastlog_file));
+        } else {
                 logit("%s: %.100s is not a file or directory!", __func__,
                     LASTLOG_FILE);
                 return (0);
@@ -1522,7 +1489,7 @@ lastlog_openseek(struct logininfo *li, int *fd, int filemode)
                 return (0);
         }
 
-        if (type == LL_FILE) {
+        if (S_ISREG(st.st_mode)) {
                 /* find this uid's offset in the lastlog file */
                 offset = (off_t) ((long)li->uid * sizeof(struct lastlog));
 
@@ -1535,52 +1502,74 @@ lastlog_openseek(struct logininfo *li, int *fd, int filemode)
 
         return (1);
 }
+#endif /* !LASTLOG_WRITE_PUTUTXLINE || !HAVE_GETLASTLOGXBYNAME */
 
-static int
-lastlog_perform_login(struct logininfo *li)
+#ifdef LASTLOG_WRITE_PUTUTXLINE
+int
+lastlog_write_entry(struct logininfo *li)
 {
-        struct lastlog last;
-        int fd;
-
-        /* create our struct lastlog */
-        lastlog_construct(li, &last);
-
-        if (!lastlog_openseek(li, &fd, O_RDWR|O_CREAT))
-                return (0);
-
-        /* write the entry */
-        if (atomicio(vwrite, fd, &last, sizeof(last)) != sizeof(last)) {
-                close(fd);
-                logit("%s: Error writing to %s: %s", __func__,
-                    LASTLOG_FILE, strerror(errno));
-                return (0);
+        switch(li->type) {
+        case LTYPE_LOGIN:
+                return 1; /* lastlog written by pututxline */
+        default:
+                logit("lastlog_write_entry: Invalid type field");
+                return 0;
         }
-
-        close(fd);
-        return (1);
 }
-
+#else /* LASTLOG_WRITE_PUTUTXLINE */
 int
 lastlog_write_entry(struct logininfo *li)
 {
+        struct lastlog last;
+        int fd;
+
         switch(li->type) {
         case LTYPE_LOGIN:
-                return (lastlog_perform_login(li));
+                /* create our struct lastlog */
+                memset(&last, '\0', sizeof(last));
+                line_stripname(last.ll_line, li->line, sizeof(last.ll_line));
+                strlcpy(last.ll_host, li->hostname,
+                    MIN_SIZEOF(last.ll_host, li->hostname));
+                last.ll_time = li->tv_sec;
+        
+                if (!lastlog_openseek(li, &fd, O_RDWR|O_CREAT))
+                        return (0);
+        
+                /* write the entry */
+                if (atomicio(vwrite, fd, &last, sizeof(last)) != sizeof(last)) {
+                        close(fd);
+                        logit("%s: Error writing to %s: %s", __func__,
+                            LASTLOG_FILE, strerror(errno));
+                        return (0);
+                }
+        
+                close(fd);
+                return (1);
         default:
                 logit("%s: Invalid type field", __func__);
                 return (0);
         }
 }
+#endif /* LASTLOG_WRITE_PUTUTXLINE */
 
-static void
-lastlog_populate_entry(struct logininfo *li, struct lastlog *last)
+#ifdef HAVE_GETLASTLOGXBYNAME
+int
+lastlog_get_entry(struct logininfo *li)
 {
-        line_fullname(li->line, last->ll_line, sizeof(li->line));
-        strlcpy(li->hostname, last->ll_host,
-            MIN_SIZEOF(li->hostname, last->ll_host));
-        li->tv_sec = last->ll_time;
-}
+        struct lastlogx l, *ll;
 
+        if ((ll = getlastlogxbyname(li->username, &l)) == NULL) {
+                memset(&l, '\0', sizeof(l));
+                ll = &l;
+        }
+        line_fullname(li->line, ll->ll_line, sizeof(li->line));
+        strlcpy(li->hostname, ll->ll_host,
+                MIN_SIZEOF(li->hostname, ll->ll_host));
+        li->tv_sec = ll->ll_tv.tv_sec;
+        li->tv_usec = ll->ll_tv.tv_usec;
+        return (1);
+}
+#else /* HAVE_GETLASTLOGXBYNAME */
 int
 lastlog_get_entry(struct logininfo *li)
 {
@@ -1598,7 +1587,10 @@ lastlog_get_entry(struct logininfo *li)
                 memset(&last, '\0', sizeof(last));
                 /* FALLTHRU */
         case sizeof(last):
-                lastlog_populate_entry(li, &last);
+                line_fullname(li->line, last.ll_line, sizeof(li->line));
+                strlcpy(li->hostname, last.ll_host,
+                    MIN_SIZEOF(li->hostname, last.ll_host));
+                li->tv_sec = last.ll_time;
                 return (1);
         case -1:
                 error("%s: Error reading from %s: %s", __func__,
@@ -1613,6 +1605,7 @@ lastlog_get_entry(struct logininfo *li)
         /* NOTREACHED */
         return (0);
 }
+#endif /* HAVE_GETLASTLOGXBYNAME */
 #endif /* USE_LASTLOG */
 
 #ifdef USE_BTMP