1 files changed, 104 insertions, 82 deletions

diff --git a/debian/patches/consolekit.patch b/debian/patches/consolekit.patch
index fd064a848..f43e78500 100644
--- a/debian/patches/consolekit.patch
+++ b/debian/patches/consolekit.patch
@@ -1,13 +1,33 @@
-Description: Add support for registering ConsoleKit sessions on login
-Author: Colin Watson <cjwatson@ubuntu.com>
+From cfae2bfa1e95cbb6c7a9799f13b82e8e804ca869 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
 
-Index: b/Makefile.in
-===================================================================
+Patch-Name: consolekit.patch
+---
+ Makefile.in    |   3 +-
+ configure      | 132 +++++++++++++++++++++++++++++++
+ configure.ac   |  25 ++++++
+ consolekit.c   | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ consolekit.h   |  24 ++++++
+ monitor.c      |  43 +++++++++++
+ monitor.h      |   2 +
+ monitor_wrap.c |  31 ++++++++
+ monitor_wrap.h |   4 +
+ session.c      |  13 ++++
+ session.h      |   6 ++
+ 11 files changed, 522 insertions(+), 1 deletion(-)
+ create mode 100644 consolekit.c
+ create mode 100644 consolekit.h
+
+diff --git a/Makefile.in b/Makefile.in
+index b8f5099..ca6eee5 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -96,7 +96,8 @@
+@@ -96,7 +96,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
         sftp-server.o sftp-common.o \
         roaming_common.o roaming_serv.o \
         sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
@@ -17,54 +37,11 @@ Index: b/Makefile.in
  
  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 ssh-vulnkey.1.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 ssh-vulnkey.1 sshd_config.5 ssh_config.5
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -3841,6 +3841,30 @@
- AC_SUBST([GSSLIBS])
- AC_SUBST([K5LIBS])
- 
-+# Check whether user wants ConsoleKit support
-+CONSOLEKIT_MSG="no"
-+LIBCK_CONNECTOR=""
-+AC_ARG_WITH(consolekit,
-+       [  --with-consolekit       Enable ConsoleKit support],
-+       [ if test "x$withval" != "xno" ; then
-+               AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
-+               if test "$PKGCONFIG" != "no"; then
-+                       AC_MSG_CHECKING([for ck-connector])
-+                       if $PKGCONFIG --exists ck-connector; then
-+                               CKCON_CFLAGS=`$PKGCONFIG --cflags ck-connector`
-+                               CKCON_LIBS=`$PKGCONFIG --libs ck-connector`
-+                               CPPFLAGS="$CPPFLAGS $CKCON_CFLAGS"
-+                               SSHDLIBS="$SSHDLIBS $CKCON_LIBS"
-+                               AC_MSG_RESULT([yes])
-+                               AC_DEFINE(USE_CONSOLEKIT, 1, [Define if you want ConsoleKit support.])
-+                               CONSOLEKIT_MSG="yes"
-+                       else
-+                               AC_MSG_RESULT([no])
-+                       fi
-+               fi
-+       fi ]
-+)
-+
- # Looking for programs, paths and files
- 
- PRIVSEP_PATH=/var/empty
-@@ -4641,6 +4665,7 @@
- echo "                   libedit support: $LIBEDIT_MSG"
- echo "  Solaris process contract support: $SPC_MSG"
- echo "           Solaris project support: $SP_MSG"
-+echo "                ConsoleKit support: $CONSOLEKIT_MSG"
- echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
- echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
- echo "                  BSD Auth support: $BSD_AUTH_MSG"
-Index: b/configure
-===================================================================
+diff --git a/configure b/configure
+index ceb1b5d..78bbcd0 100755
 --- a/configure
 +++ b/configure
-@@ -738,6 +738,7 @@
+@@ -738,6 +738,7 @@ with_privsep_user
  with_sandbox
  with_selinux
  with_kerberos5
@@ -72,7 +49,7 @@ Index: b/configure
  with_privsep_path
  with_xauth
  enable_strip
-@@ -1428,6 +1429,7 @@
+@@ -1428,6 +1429,7 @@ Optional Packages:
    --with-sandbox=style    Specify privilege separation sandbox (no, darwin, rlimit, systrace, seccomp_filter)
    --with-selinux          Enable SELinux support
    --with-kerberos5=PATH   Enable Kerberos 5 support
@@ -80,7 +57,7 @@ Index: b/configure
    --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
-@@ -16375,6 +16377,135 @@
+@@ -16375,6 +16377,135 @@ fi
  
  
  
@@ -216,7 +193,50 @@ Index: b/configure
  # Looking for programs, paths and files
  
  PRIVSEP_PATH=/var/empty
-@@ -18902,6 +19033,7 @@
+@@ -18902,6 +19033,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"
++echo "                ConsoleKit support: $CONSOLEKIT_MSG"
+ echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
+ 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 4c1a658..d7d500a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3841,6 +3841,30 @@ AC_ARG_WITH([kerberos5],
+ AC_SUBST([GSSLIBS])
+ AC_SUBST([K5LIBS])
+ 
++# Check whether user wants ConsoleKit support
++CONSOLEKIT_MSG="no"
++LIBCK_CONNECTOR=""
++AC_ARG_WITH(consolekit,
++       [  --with-consolekit       Enable ConsoleKit support],
++       [ if test "x$withval" != "xno" ; then
++               AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
++               if test "$PKGCONFIG" != "no"; then
++                       AC_MSG_CHECKING([for ck-connector])
++                       if $PKGCONFIG --exists ck-connector; then
++                               CKCON_CFLAGS=`$PKGCONFIG --cflags ck-connector`
++                               CKCON_LIBS=`$PKGCONFIG --libs ck-connector`
++                               CPPFLAGS="$CPPFLAGS $CKCON_CFLAGS"
++                               SSHDLIBS="$SSHDLIBS $CKCON_LIBS"
++                               AC_MSG_RESULT([yes])
++                               AC_DEFINE(USE_CONSOLEKIT, 1, [Define if you want ConsoleKit support.])
++                               CONSOLEKIT_MSG="yes"
++                       else
++                               AC_MSG_RESULT([no])
++                       fi
++               fi
++       fi ]
++)
++
+ # Looking for programs, paths and files
+ 
+ PRIVSEP_PATH=/var/empty
+@@ -4641,6 +4665,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"
@@ -224,8 +244,9 @@ Index: b/configure
  echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
  echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
  echo "                  BSD Auth support: $BSD_AUTH_MSG"
-Index: b/consolekit.c
-===================================================================
+diff --git a/consolekit.c b/consolekit.c
+new file mode 100644
+index 0000000..f1039e6
 --- /dev/null
 +++ b/consolekit.c
 @@ -0,0 +1,240 @@
@@ -469,8 +490,9 @@ Index: b/consolekit.c
 +}
 +
 +#endif /* USE_CONSOLEKIT */
-Index: b/consolekit.h
-===================================================================
+diff --git a/consolekit.h b/consolekit.h
+new file mode 100644
+index 0000000..8ce3716
 --- /dev/null
 +++ b/consolekit.h
 @@ -0,0 +1,24 @@
@@ -498,8 +520,8 @@ Index: b/consolekit.h
 +void    consolekit_unregister(struct Session *);
 +
 +#endif /* USE_CONSOLEKIT */
-Index: b/monitor.c
-===================================================================
+diff --git a/monitor.c b/monitor.c
+index e8d63eb..9bc4f0b 100644
 --- a/monitor.c
 +++ b/monitor.c
 @@ -98,6 +98,9 @@
@@ -512,7 +534,7 @@ Index: b/monitor.c
  
  #ifdef GSSAPI
  static Gssctxt *gsscontext = NULL;
-@@ -193,6 +196,10 @@
+@@ -193,6 +196,10 @@ int mm_answer_audit_command(int, Buffer *);
  
  static int monitor_read_log(struct monitor *);
  
@@ -523,7 +545,7 @@ Index: b/monitor.c
  static Authctxt *authctxt;
  static BIGNUM *ssh1_challenge = NULL;  /* used for ssh1 rsa auth */
  
-@@ -285,6 +292,9 @@
+@@ -285,6 +292,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
@@ -533,7 +555,7 @@ Index: b/monitor.c
      {0, 0, NULL}
  };
  
-@@ -327,6 +337,9 @@
+@@ -327,6 +337,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
@@ -543,7 +565,7 @@ Index: b/monitor.c
      {0, 0, NULL}
  };
  
-@@ -514,6 +527,9 @@
+@@ -514,6 +527,9 @@ monitor_child_postauth(struct monitor *pmonitor)
                 monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1);
                 monitor_permit(mon_dispatch, MONITOR_REQ_PTYCLEANUP, 1);
         }
@@ -553,7 +575,7 @@ Index: b/monitor.c
  
         for (;;)
                 monitor_read(pmonitor, mon_dispatch, NULL);
-@@ -2492,3 +2508,30 @@
+@@ -2492,3 +2508,30 @@ mm_answer_jpake_check_confirm(int sock, Buffer *m)
  }
  
  #endif /* JPAKE */
@@ -584,11 +606,11 @@ Index: b/monitor.c
 +       return (0);
 +}
 +#endif /* USE_CONSOLEKIT */
-Index: b/monitor.h
-===================================================================
+diff --git a/monitor.h b/monitor.h
+index 3c13706..cd83428 100644
 --- a/monitor.h
 +++ b/monitor.h
-@@ -75,6 +75,8 @@
+@@ -75,6 +75,8 @@ enum monitor_reqtype {
  
         MONITOR_REQ_AUTHROLE = 154,
  
@@ -597,11 +619,11 @@ Index: b/monitor.h
  };
  
  struct mm_master;
-Index: b/monitor_wrap.c
-===================================================================
+diff --git a/monitor_wrap.c b/monitor_wrap.c
+index 69bc324..670b62d 100644
 --- a/monitor_wrap.c
 +++ b/monitor_wrap.c
-@@ -1516,3 +1516,34 @@
+@@ -1516,3 +1516,34 @@ mm_jpake_check_confirm(const BIGNUM *k,
         return success;
  }
  #endif /* JPAKE */
@@ -636,11 +658,11 @@ Index: b/monitor_wrap.c
 +       return (cookie);
 +}
 +#endif /* USE_CONSOLEKIT */
-Index: b/monitor_wrap.h
-===================================================================
+diff --git a/monitor_wrap.h b/monitor_wrap.h
+index 4d12e29..360fb9f 100644
 --- a/monitor_wrap.h
 +++ b/monitor_wrap.h
-@@ -131,4 +131,8 @@
+@@ -131,4 +131,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 *);
  
@@ -649,8 +671,8 @@ Index: b/monitor_wrap.h
 +#endif /* USE_CONSOLEKIT */
 +
  #endif /* _MM_WRAP_H_ */
-Index: b/session.c
-===================================================================
+diff --git a/session.c b/session.c
+index b4d74d9..15bdb1b 100644
 --- a/session.c
 +++ b/session.c
 @@ -92,6 +92,7 @@
@@ -661,7 +683,7 @@ Index: b/session.c
  
  #if defined(KRB5) && defined(USE_AFS)
  #include <kafs.h>
-@@ -1132,6 +1133,9 @@
+@@ -1132,6 +1133,9 @@ do_setup_env(Session *s, const char *shell)
  #if !defined (HAVE_LOGIN_CAP) && !defined (HAVE_CYGWIN)
         char *path = NULL;
  #endif
@@ -671,7 +693,7 @@ Index: b/session.c
  
         /* Initialize the environment. */
         envsize = 100;
-@@ -1276,6 +1280,11 @@
+@@ -1276,6 +1280,11 @@ do_setup_env(Session *s, const char *shell)
                 child_set_env(&env, &envsize, "KRB5CCNAME",
                     s->authctxt->krb5_ccname);
  #endif
@@ -683,7 +705,7 @@ Index: b/session.c
  #ifdef USE_PAM
         /*
          * Pull in any environment variables that may have
-@@ -2320,6 +2329,10 @@
+@@ -2320,6 +2329,10 @@ session_pty_cleanup2(Session *s)
  
         debug("session_pty_cleanup: session %d release %s", s->self, s->tty);
  
@@ -694,8 +716,8 @@ Index: b/session.c
         /* Record that the user has logged out. */
         if (s->pid != 0)
                 record_logout(s->pid, s->tty, s->pw->pw_name);
-Index: b/session.h
-===================================================================
+diff --git a/session.h b/session.h
+index cb4f196..7e51b6a 100644
 --- a/session.h
 +++ b/session.h
 @@ -26,6 +26,8 @@
@@ -707,7 +729,7 @@ Index: b/session.h
  #define TTYSZ 64
  typedef struct Session Session;
  struct Session {
-@@ -60,6 +62,10 @@
+@@ -60,6 +62,10 @@ struct Session {
                 char    *name;
                 char    *val;
         } *env;