[systemd-commits] 2 commits - man/daemon.xml src/systemctl.c

[Lennart Poettering]

 man/daemon.xml  |    2 +-
 src/systemctl.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0a9962a1dff86f7949185f1bcf1fb9523cbca13b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Aug 7 18:09:39 2010 +0200

    man: minor man page fix

diff --git a/man/daemon.xml b/man/daemon.xml
index 4afe712..b8e9df4 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -873,7 +873,7 @@ fi</programlisting>
                         file. This fragment will ensure that the first
                         time the unit file is installed it will be
                         enabled if and only if the SysV init script is
-                        enabled, thus making sure that the the enable
+                        enabled, thus making sure that the enable
                         status is not changed. Note that
                         <command>chkconfig</command> is a command
                         specific to Fedora which can be used to check
commit 4a4d6b4b319915f6108c26455d9807d1c99c8ab6
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Sat Aug 7 11:01:08 2010 +0200

    systemctl: fix parsing of DBus reply in 'dot'
    
    "systemctl dot" has been broken since the addition of the "Following="
    property.

diff --git a/src/systemctl.c b/src/systemctl.c
index 3ca1464..1844638 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -489,7 +489,7 @@ static int dot(DBusConnection *bus, char **args, unsigned n) {
 
         dbus_message_iter_recurse(&iter, &sub);
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
-                const char *id, *description, *load_state, *active_state, *sub_state, *unit_path;
+                const char *id, *description, *load_state, *active_state, *sub_state, *following, *unit_path;
 
                 if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) {
                         log_error("Failed to parse reply.");
@@ -504,6 +504,7 @@ static int dot(DBusConnection *bus, char **args, unsigned n) {
                     bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &load_state, true) < 0 ||
                     bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &active_state, true) < 0 ||
                     bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &sub_state, true) < 0 ||
+                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &following, true) < 0 ||
                     bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &unit_path, true) < 0) {
                         log_error("Failed to parse reply.");
                         r = -EIO;