dbus: fix capability serialization

diff --git a/src/dbus-execute.c b/src/dbus-execute.c
index 55c61e593fbf5c6a4caaeed454bc321f1e6617b5..1222d1bfd237b35d3ddb54f1da5ec9a49491d2cd 100644 (file)
--- a/src/dbus-execute.c
+++ b/src/dbus-execute.c
@@ -209,11 +209,13 @@ int bus_execute_append_capabilities(Manager *m, DBusMessageIter *i, const char *
         else
                 s = "";
 
-        if (!t)
+        if (!s)
                 return -ENOMEM;
 
         b = dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &s);
-        cap_free(t);
+
+        if (t)
+                cap_free(t);
 
         if (!b)
                 return -ENOMEM;

diff --git a/src/dbus-execute.h b/src/dbus-execute.h
index a00acbe2f06f9d2a81b28595f8d931d727546f33..cc4b803ca76d08db8036ee174ab3b26d6ba1dab5 100644 (file)
--- a/src/dbus-execute.h
+++ b/src/dbus-execute.h
@@ -127,7 +127,7 @@
         { interface, "SyslogPriority",                bus_property_append_int,    "i",     &(context).syslog_priority              }, \
         { interface, "SyslogIdentifier",              bus_property_append_string, "s",     (context).syslog_identifier             }, \
         { interface, "SyslogLevelPrefix",             bus_property_append_bool,   "b",     &(context).syslog_level_prefix          }, \
-        { interface, "Capabilities",                  bus_execute_append_capabilities, "s", (context).capabilities                 }, \
+        { interface, "Capabilities",                  bus_execute_append_capabilities, "s",&(context)                              }, \
         { interface, "SecureBits",                    bus_property_append_int,    "i",     &(context).secure_bits                  }, \
         { interface, "CapabilityBoundingSetDrop",     bus_property_append_uint64, "t",     &(context).capability_bounding_set_drop }, \
         { interface, "User",                          bus_property_append_string, "s",     (context).user                          }, \