[maemo-commits] [maemo-commits] r19343 - in projects/haf/tags/ke-recv/3.19-10: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-09-11 16:22:22 +0300 (Fri, 11 Sep 2009)
New Revision: 19343

Modified:
   projects/haf/tags/ke-recv/3.19-10/debian/changelog
   projects/haf/tags/ke-recv/3.19-10/src/ke-recv.c
   projects/haf/tags/ke-recv/3.19-10/src/ke-recv.h
Log:
fix NB#138145 with Alban's patch


Modified: projects/haf/tags/ke-recv/3.19-10/debian/changelog
===================================================================
--- projects/haf/tags/ke-recv/3.19-10/debian/changelog	2009-09-11 13:06:22 UTC (rev 19342)
+++ projects/haf/tags/ke-recv/3.19-10/debian/changelog	2009-09-11 13:22:22 UTC (rev 19343)
@@ -3,6 +3,9 @@
   * Fixes: NB#137197 - Not able to enable Mass storage when no other
     applications are running
 
+  Alban Crequy:
+  * Fixes: NB#138145 - ke-recv listens on D-Bus too broadly
+
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 11 Sep 2009 15:59:16 +0300
 
 ke-recv (3.19-9) unstable; urgency=low

Modified: projects/haf/tags/ke-recv/3.19-10/src/ke-recv.c
===================================================================
--- projects/haf/tags/ke-recv/3.19-10/src/ke-recv.c	2009-09-11 13:06:22 UTC (rev 19342)
+++ projects/haf/tags/ke-recv/3.19-10/src/ke-recv.c	2009-09-11 13:22:22 UTC (rev 19343)
@@ -3169,12 +3169,18 @@
 	        exit(1);
         }
 
-        dbus_bus_add_match(conn, MCE_MATCH_RULE, &error);
+        dbus_bus_add_match(conn, MCE_DEVICELOCK_SIG_MATCH_RULE, &error);
         if (dbus_error_is_set(&error)) {
                 ULOG_CRIT_L("dbus_bus_add_match for %s failed",
-                            MCE_MATCH_RULE);
+                            MCE_DEVICELOCK_SIG_MATCH_RULE);
 	        exit(1);
         }
+        dbus_bus_add_match(conn, MCE_SHUTDOWN_SIG_MATCH_RULE, &error);
+        if (dbus_error_is_set(&error)) {
+                ULOG_CRIT_L("dbus_bus_add_match for %s failed",
+                            MCE_SHUTDOWN_SIG_MATCH_RULE);
+	        exit(1);
+        }
         /* match for HD readiness signal */
         dbus_bus_add_match(conn, "type='signal',member='ready',"
                            "interface='" DESKTOP_IF "'",

Modified: projects/haf/tags/ke-recv/3.19-10/src/ke-recv.h
===================================================================
--- projects/haf/tags/ke-recv/3.19-10/src/ke-recv.h	2009-09-11 13:06:22 UTC (rev 19342)
+++ projects/haf/tags/ke-recv/3.19-10/src/ke-recv.h	2009-09-11 13:22:22 UTC (rev 19343)
@@ -94,7 +94,10 @@
 #define MCE_DEVICELOCK_SIG "devicelock_mode_ind"
 #define MCE_SHUTDOWN_SIG "shutdown_ind"
 #define MCE_LOCKED_STR "locked"
-#define MCE_MATCH_RULE "type='signal',interface='" MCE_SIGNAL_IF "'"
+#define MCE_DEVICELOCK_SIG_MATCH_RULE "type='signal',interface='" \
+  MCE_SIGNAL_IF "',member='" MCE_DEVICELOCK_SIG "'"
+#define MCE_SHUTDOWN_SIG_MATCH_RULE "type='signal',interface='" \
+  MCE_SIGNAL_IF "',member='" MCE_SHUTDOWN_SIG "'"
 
 /* low-memory signal from kdbusd */
 #define LOWMEM_SIGNAL_OP "/org/kernel/kernel/high_watermark"