PolicyKit: Branch 'master'

[David Zeuthen]

 polkitd/main.c          |    2 +-
 polkitd/polkit-daemon.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3a02908eaf79f7968008c32323596bcc56c43d65
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Oct 30 21:27:06 2007 -0400

    remember to reset killtimer and fix an error message

diff --git a/polkitd/main.c b/polkitd/main.c
index fe7b626..720c065 100644
--- a/polkitd/main.c
+++ b/polkitd/main.c
@@ -153,7 +153,7 @@ main (int argc, char **argv)
         error = NULL;
         bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
         if (bus == NULL) {
-                g_warning ("Couldn't connect to session bus: %s", error->message);
+                g_warning ("Couldn't connect to system bus: %s", error->message);
                 g_error_free (error);
                 goto out;
         }
diff --git a/polkitd/polkit-daemon.c b/polkitd/polkit-daemon.c
index 48353b5..475694a 100644
--- a/polkitd/polkit-daemon.c
+++ b/polkitd/polkit-daemon.c
@@ -459,6 +459,8 @@ polkit_daemon_is_process_authorized (PolKitDaemon          *daemon,
         GError *error;
         PolKitCaller *pk_caller;
 
+        reset_killtimer ();
+
         ret = FALSE;
         pk_caller = NULL;
 
@@ -493,6 +495,8 @@ polkit_daemon_is_system_bus_name_authorized (PolKitDaemon          *daemon,
         GError *error;
         PolKitCaller *pk_caller;
 
+        reset_killtimer ();
+
         ret = FALSE;
         pk_caller = NULL;