Merge 6.6p1.

* New upstream release (http://www.openssh.com/txt/release-6.6).

1 files changed, 35 insertions, 37 deletions

diff --git a/debian/patches/consolekit.patch b/debian/patches/consolekit.patch
index 7492daca8..e3ff4d7e4 100644
--- a/debian/patches/consolekit.patch
+++ b/debian/patches/consolekit.patch
@@ -1,10 +1,10 @@
-From f4858fd1a10d1621e5e3ad5f2400dd17d156ced7 Mon Sep 17 00:00:00 2001
+From 7a26d16efb4ee303c8d66ee82caf9d0686f4a074 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Sun, 9 Feb 2014 16:09:57 +0000
 Subject: Add support for registering ConsoleKit sessions on login
 
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1450
-Last-Updated: 2013-09-14
+Last-Updated: 2014-03-20
 
 Patch-Name: consolekit.patch
 ---
@@ -13,18 +13,18 @@ Patch-Name: consolekit.patch
  configure.ac   |  25 ++++++
  consolekit.c   | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  consolekit.h   |  24 ++++++
- monitor.c      |  43 +++++++++++
+ monitor.c      |  42 ++++++++++
  monitor.h      |   2 +
- monitor_wrap.c |  31 ++++++++
+ monitor_wrap.c |  30 ++++++++
  monitor_wrap.h |   4 +
  session.c      |  13 ++++
  session.h      |   6 ++
- 11 files changed, 522 insertions(+), 1 deletion(-)
+ 11 files changed, 520 insertions(+), 1 deletion(-)
  create mode 100644 consolekit.c
  create mode 100644 consolekit.h
 
 diff --git a/Makefile.in b/Makefile.in
-index 35c6fd6..598d55a 100644
+index ee1d2c3..3d96c05 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -97,7 +97,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
@@ -38,7 +38,7 @@ index 35c6fd6..598d55a 100644
  MANPAGES       = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
  MANPAGES_IN    = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
 diff --git a/configure b/configure
-index 5a9db2d..57b68e2 100755
+index b6b5b6d..e2f12cd 100755
 --- a/configure
 +++ b/configure
 @@ -740,6 +740,7 @@ with_privsep_user
@@ -57,7 +57,7 @@ index 5a9db2d..57b68e2 100755
    --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty)
    --with-xauth=PATH       Specify path to xauth program
    --with-maildir=/path/to/mail    Specify your system mail directory
-@@ -17215,6 +17217,135 @@ fi
+@@ -17217,6 +17219,135 @@ fi
  
  
  
@@ -193,7 +193,7 @@ index 5a9db2d..57b68e2 100755
  # Looking for programs, paths and files
  
  PRIVSEP_PATH=/var/empty
-@@ -19744,6 +19875,7 @@ echo "              MD5 password support: $MD5_MSG"
+@@ -19746,6 +19877,7 @@ echo "              MD5 password support: $MD5_MSG"
  echo "                   libedit support: $LIBEDIT_MSG"
  echo "  Solaris process contract support: $SPC_MSG"
  echo "           Solaris project support: $SP_MSG"
@@ -202,10 +202,10 @@ index 5a9db2d..57b68e2 100755
  echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
  echo "                  BSD Auth support: $BSD_AUTH_MSG"
 diff --git a/configure.ac b/configure.ac
-index 90eebf5..e2289cd 100644
+index d235fb0..8669271 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4070,6 +4070,30 @@ AC_ARG_WITH([kerberos5],
+@@ -4072,6 +4072,30 @@ AC_ARG_WITH([kerberos5],
  AC_SUBST([GSSLIBS])
  AC_SUBST([K5LIBS])
  
@@ -236,7 +236,7 @@ index 90eebf5..e2289cd 100644
  # Looking for programs, paths and files
  
  PRIVSEP_PATH=/var/empty
-@@ -4871,6 +4895,7 @@ echo "              MD5 password support: $MD5_MSG"
+@@ -4873,6 +4897,7 @@ echo "              MD5 password support: $MD5_MSG"
  echo "                   libedit support: $LIBEDIT_MSG"
  echo "  Solaris process contract support: $SPC_MSG"
  echo "           Solaris project support: $SP_MSG"
@@ -521,11 +521,11 @@ index 0000000..8ce3716
 +
 +#endif /* USE_CONSOLEKIT */
 diff --git a/monitor.c b/monitor.c
-index 88f472e..8ffea4f 100644
+index 11eac63..7c105e6 100644
 --- a/monitor.c
 +++ b/monitor.c
-@@ -98,6 +98,9 @@
- #include "jpake.h"
+@@ -97,6 +97,9 @@
+ #include "ssh2.h"
  #include "roaming.h"
  #include "authfd.h"
 +#ifdef USE_CONSOLEKIT
@@ -534,7 +534,7 @@ index 88f472e..8ffea4f 100644
  
  #ifdef GSSAPI
  static Gssctxt *gsscontext = NULL;
-@@ -193,6 +196,10 @@ int mm_answer_audit_command(int, Buffer *);
+@@ -187,6 +190,10 @@ int mm_answer_audit_command(int, Buffer *);
  
  static int monitor_read_log(struct monitor *);
  
@@ -545,7 +545,7 @@ index 88f472e..8ffea4f 100644
  static Authctxt *authctxt;
  static BIGNUM *ssh1_challenge = NULL;  /* used for ssh1 rsa auth */
  
-@@ -285,6 +292,9 @@ struct mon_table mon_dispatch_postauth20[] = {
+@@ -272,6 +279,9 @@ struct mon_table mon_dispatch_postauth20[] = {
      {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
      {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command},
  #endif
@@ -555,7 +555,7 @@ index 88f472e..8ffea4f 100644
      {0, 0, NULL}
  };
  
-@@ -327,6 +337,9 @@ struct mon_table mon_dispatch_postauth15[] = {
+@@ -314,6 +324,9 @@ struct mon_table mon_dispatch_postauth15[] = {
      {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
      {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command},
  #endif
@@ -565,7 +565,7 @@ index 88f472e..8ffea4f 100644
      {0, 0, NULL}
  };
  
-@@ -514,6 +527,9 @@ monitor_child_postauth(struct monitor *pmonitor)
+@@ -492,6 +505,9 @@ monitor_child_postauth(struct monitor *pmonitor)
                 monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1);
                 monitor_permit(mon_dispatch, MONITOR_REQ_PTYCLEANUP, 1);
         }
@@ -575,11 +575,10 @@ index 88f472e..8ffea4f 100644
  
         for (;;)
                 monitor_read(pmonitor, mon_dispatch, NULL);
-@@ -2493,3 +2509,30 @@ mm_answer_jpake_check_confirm(int sock, Buffer *m)
- }
+@@ -2269,3 +2285,29 @@ mm_answer_gss_updatecreds(int socket, Buffer *m) {
+ 
+ #endif /* GSSAPI */
  
- #endif /* JPAKE */
-+
 +#ifdef USE_CONSOLEKIT
 +int
 +mm_answer_consolekit_register(int sock, Buffer *m)
@@ -607,10 +606,10 @@ index 88f472e..8ffea4f 100644
 +}
 +#endif /* USE_CONSOLEKIT */
 diff --git a/monitor.h b/monitor.h
-index 3c13706..cd83428 100644
+index 4d5e8fa..10ba59e 100644
 --- a/monitor.h
 +++ b/monitor.h
-@@ -75,6 +75,8 @@ enum monitor_reqtype {
+@@ -70,6 +70,8 @@ enum monitor_reqtype {
  
         MONITOR_REQ_AUTHROLE = 154,
  
@@ -620,14 +619,13 @@ index 3c13706..cd83428 100644
  
  struct mm_master;
 diff --git a/monitor_wrap.c b/monitor_wrap.c
-index 69bc324..670b62d 100644
+index f75dc9d..a8fb07b 100644
 --- a/monitor_wrap.c
 +++ b/monitor_wrap.c
-@@ -1516,3 +1516,34 @@ mm_jpake_check_confirm(const BIGNUM *k,
-        return success;
- }
- #endif /* JPAKE */
-+
+@@ -1353,3 +1353,33 @@ mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
+ 
+ #endif /* GSSAPI */
+ 
 +#ifdef USE_CONSOLEKIT
 +char *
 +mm_consolekit_register(Session *s, const char *display)
@@ -659,10 +657,10 @@ index 69bc324..670b62d 100644
 +}
 +#endif /* USE_CONSOLEKIT */
 diff --git a/monitor_wrap.h b/monitor_wrap.h
-index 4d12e29..360fb9f 100644
+index 9c2ee49..00e93fe 100644
 --- a/monitor_wrap.h
 +++ b/monitor_wrap.h
-@@ -131,4 +131,8 @@ void *mm_zalloc(struct mm_master *, u_int, u_int);
+@@ -111,4 +111,8 @@ void *mm_zalloc(struct mm_master *, u_int, u_int);
  void mm_zfree(struct mm_master *, void *);
  void mm_init_compression(struct mm_master *);
  
@@ -672,7 +670,7 @@ index 4d12e29..360fb9f 100644
 +
  #endif /* _MM_WRAP_H_ */
 diff --git a/session.c b/session.c
-index 5ddd82a..14df226 100644
+index 6848df4..9d43fc3 100644
 --- a/session.c
 +++ b/session.c
 @@ -92,6 +92,7 @@
@@ -683,7 +681,7 @@ index 5ddd82a..14df226 100644
  
  #if defined(KRB5) && defined(USE_AFS)
  #include <kafs.h>
-@@ -1155,6 +1156,9 @@ do_setup_env(Session *s, const char *shell)
+@@ -1160,6 +1161,9 @@ do_setup_env(Session *s, const char *shell)
  #if !defined (HAVE_LOGIN_CAP) && !defined (HAVE_CYGWIN)
         char *path = NULL;
  #endif
@@ -693,7 +691,7 @@ index 5ddd82a..14df226 100644
  
         /* Initialize the environment. */
         envsize = 100;
-@@ -1299,6 +1303,11 @@ do_setup_env(Session *s, const char *shell)
+@@ -1304,6 +1308,11 @@ do_setup_env(Session *s, const char *shell)
                 child_set_env(&env, &envsize, "KRB5CCNAME",
                     s->authctxt->krb5_ccname);
  #endif
@@ -705,7 +703,7 @@ index 5ddd82a..14df226 100644
  #ifdef USE_PAM
         /*
          * Pull in any environment variables that may have
-@@ -2348,6 +2357,10 @@ session_pty_cleanup2(Session *s)
+@@ -2353,6 +2362,10 @@ session_pty_cleanup2(Session *s)
  
         debug("session_pty_cleanup: session %d release %s", s->self, s->tty);