components/ConsoleKit/patches/04-sol-tty.patch

   1 commit dcd505d9801990781123093de5913f365b94782f
   2 Author: Halton Huo <halton.huo@sun.com>
   3 Date:   Fri Sep 25 14:46:27 2009 +0800
   4
   5     Correct tty return value after VT support is integrated in Solaris.
   6
   7 diff --git a/src/ck-sysdeps-solaris.c b/src/ck-sysdeps-solaris.c
   8 index bc3b695..607a3ae 100644
   9 --- a/src/ck-sysdeps-solaris.c
  10 +++ b/src/ck-sysdeps-solaris.c
  11 @@ -180,27 +180,8 @@ stat2proc (pid_t        pid,
  12         if (tty_maj == 15) {
  13                 snprintf (P->tty_text, sizeof P->tty_text, "/dev/vt/%u", tty_min);
  14          }
  15 -        if (tty_maj == 24) {
  16 -                snprintf (P->tty_text, sizeof P->tty_text, "/dev/pts/%u", tty_min);
  17 -        }
  18 -
  19          if (P->tty == NO_TTY_VALUE) {
  20 -#ifdef HAVE_SYS_VT_H
  21                  memcpy (P->tty_text, "   ?   ", 8);
  22 -#else
  23 -                /*
  24 -                 * This is a bit of a hack.  On Solaris, pre-VT integration, the
  25 -                 * Xorg process is not assigned a TTY.  So, just assign the value
  26 -                 * to "/dev/console" if running without VT support.  This will
  27 -                 * allow people using Solaris pre-VT integration to use
  28 -                 * ConsoleKit.
  29 -                 */
  30 -                memcpy (P->tty_text, "/dev/console", 12);
  31 -#endif
  32 -        }
  33 -
  34 -        if (P->tty == DEV_ENCODE(0,0)) {
  35 -                memcpy (P->tty_text, "/dev/console", 12);
  36          }
  37
  38          if (P->pid != pid) {