From: deejay1 <deejay1@pld-linux.org>
Date: Thu, 31 May 2007 16:26:59 +0000 (+0000)
Subject: - misc fixes from git master
X-Git-Tag: auto/th/ConsoleKit-0_2_1-1~5
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=6d313fb4fa37e6b70b234b4db17f1964262c9d0d;p=packages%2FConsoleKit.git

- misc fixes from git master

Changed files:
    ConsoleKit-SIGINT.patch -> 1.1
---

diff --git a/ConsoleKit-SIGINT.patch b/ConsoleKit-SIGINT.patch
new file mode 100644
index 0000000..7cf6c72
--- /dev/null
+++ b/ConsoleKit-SIGINT.patch
@@ -0,0 +1,62 @@
+From: William Jon McCann <mccann@jhu.edu>
+Date: Tue, 15 May 2007 15:15:12 +0000 (-0400)
+Subject: a few fixes for getfd suggested by Lennart
+X-Git-Url: http://gitweb.freedesktop.org/?p=ConsoleKit.git;a=commitdiff;h=17ff9ceb88e0b7f6dc5a7e6eac5ff98cb4a5cabe
+
+a few fixes for getfd suggested by Lennart
+
+I am currently investigating how to best integrate PulseAudio with
+ConsoleKit/PolicyKit. While doing that I had a look on your code, and
+found a few issues in getfd.c I'd like to report, before I forget
+them. I couldn't find any bugzilla with at consolekit project (neither
+fedora, nor fdo, nor gnome?) hence I am mailing you in person.
+
+In getfd.c in open_a_console() a close() is missing if is_a_console is
+missing.
+
+The open() in open_a_console() should probably use O_NOCTTY. Otherwise
+C-c on the console might end up in a SIGINT to your daemon process!
+
+Also I'd add an isatty() check to is_a_console(), to makes sure that
+you're actually talking to a TTY before you issue KDGKBTYPE on
+it. ioctl()s are unfortunately not unique, hence i'd recommend that check.
+
+That's it,
+
+Lennart
+---
+
+--- a/src/getfd.c
++++ b/src/getfd.c
+@@ -30,7 +30,8 @@ is_a_console (int fd)
+     char arg;
+ 
+     arg = 0;
+-    return (ioctl (fd, KDGKBTYPE, &arg) == 0
++    return (isatty (fd)
++            && ioctl (fd, KDGKBTYPE, &arg) == 0
+ 	    && ((arg == KB_101) || (arg == KB_84)));
+ }
+ 
+@@ -39,11 +40,18 @@ open_a_console (char *fnam)
+ {
+     int fd;
+ 
+-    fd = open (fnam, O_RDONLY);
++    fd = open (fnam, O_RDONLY | O_NOCTTY);
+     if (fd < 0 && errno == EACCES)
+-      fd = open(fnam, O_WRONLY);
+-    if (fd < 0 || ! is_a_console (fd))
++      fd = open (fnam, O_WRONLY | O_NOCTTY);
++
++    if (fd < 0)
+       return -1;
++
++    if (! is_a_console (fd)) {
++      close (fd);
++      fd = -1;
++    }
++
+     return fd;
+ }
+