[systemd-commits] 2 commits - man/systemd.xml src/dbus-common.c

[Lennart Poettering]

 man/systemd.xml   |    4 ++--
 src/dbus-common.c |   10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit cda2b84a69905aafe2f8c6bd3f1c9eefe92b6bbb
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Wed May 25 16:17:17 2011 +0200

    dbus-common: fix segfault when a DBus message has no interface
    
    dbus_message_get_interface() may return NULL.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=707483

diff --git a/src/dbus-common.c b/src/dbus-common.c
index 9bf0dab..5db077b 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -418,9 +418,13 @@ DBusHandlerResult bus_default_message_handler(
                         return bus_send_error_reply(c, message, &error, -EINVAL);
                 }
 
-        } else if (!nulstr_contains(interfaces, dbus_message_get_interface(message))) {
-                dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_INTERFACE, "Unknown interface");
-                return bus_send_error_reply(c, message, &error, -EINVAL);
+        } else {
+                const char *interface = dbus_message_get_interface(message);
+
+                if (!interface || !nulstr_contains(interfaces, interface)) {
+                        dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_INTERFACE, "Unknown interface");
+                        return bus_send_error_reply(c, message, &error, -EINVAL);
+                }
         }
 
         if (reply) {

commit d636fa3d67a76e512c5a3b2028e2c62ec5bbc50c
Author: William Swanson <swansontec at gmail.com>
Date:   Fri May 20 17:44:24 2011 -0700

    man: update the list of unit search locations

diff --git a/man/systemd.xml b/man/systemd.xml
index a7dc453..142c1d6 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -500,9 +500,9 @@
                                 <command>pkg-config systemd
                                 --variable=systemdsystemunitdir</command>. Other
                                 directories checked are
-                                <filename>/usr/local/share/systemd/system</filename>
+                                <filename>/usr/local/lib/systemd/system</filename>
                                 and
-                                <filename>/usr/share/systemd/system</filename>. User
+                                <filename>/usr/lib/systemd/system</filename>. User
                                 configuration always takes
                                 precedence. <command>pkg-config
                                 systemd