Mailing List Archive

Author: kihamala
Date: 2009-09-11 16:35:38 +0300 (Fri, 11 Sep 2009)
New Revision: 19344

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



Modified: projects/haf/trunk/ke-recv-extra/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv-extra/debian/changelog 2009-09-11 13:22:22 UTC (rev 19343)
+++ projects/haf/trunk/ke-recv-extra/debian/changelog 2009-09-11 13:35:38 UTC (rev 19344)
@@ -1,3 +1,9 @@
+ke-recv-extra (0.7-1) unstable; urgency=low
+
+ * Fixes: NB#138145 - hulda (ke-recv-extra) listens on D-Bus too broadly
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> Fri, 11 Sep 2009 16:23:06 +0300
+
ke-recv-extra (0.6-1) unstable; urgency=low

* Remove a bunch of auto-generated files from SVN.

Modified: projects/haf/trunk/ke-recv-extra/src/hulda.c
===================================================================
--- projects/haf/trunk/ke-recv-extra/src/hulda.c 2009-09-11 13:22:22 UTC (rev 19343)
+++ projects/haf/trunk/ke-recv-extra/src/hulda.c 2009-09-11 13:35:38 UTC (rev 19344)
@@ -437,9 +437,10 @@
exit(1);
}

- dbus_bus_add_match(conn, MCE_MATCH_RULE, &error);
+ 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_MATCH_RULE);
+ ULOG_CRIT_L("dbus_bus_add_match for %s failed",
+ MCE_SHUTDOWN_SIG_MATCH_RULE);
exit(1);
}
dbus_connection_setup_with_g_main(sys_conn, NULL);

Modified: projects/haf/trunk/ke-recv-extra/src/hulda.h
===================================================================
--- projects/haf/trunk/ke-recv-extra/src/hulda.h 2009-09-11 13:22:22 UTC (rev 19343)
+++ projects/haf/trunk/ke-recv-extra/src/hulda.h 2009-09-11 13:35:38 UTC (rev 19344)
@@ -75,7 +75,8 @@
#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_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"

_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits