sd-bus: sync kdbus.h (API+ABI break)

[elogind.git] / src / bus-proxyd / bus-proxyd.c

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 4f24e331ecd9d8d0ea6c3471ee54201d6bea2759..a5387bb234a27e684cc4532442ddd2d29fa12c6a 100644 (file)
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -239,7 +239,7 @@ static int rename_service(sd_bus *a, sd_bus *b) {
                   pid, p,
                   uid, name,
                   a->unique_name);
                   pid, p,
                   uid, name,
                   a->unique_name);

-                ;
+

         return 0;
 }
 
         return 0;
 }
 


@@ -732,7 +732,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 

-                if (service_name_is_valid(arg0) < 0)
+                if (!service_name_is_valid(arg0))

                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
 
                 cmd.flags = KDBUS_NAME_LIST_QUEUED;
                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
 
                 cmd.flags = KDBUS_NAME_LIST_QUEUED;


@@ -743,12 +743,15 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
                 name_list = (struct kdbus_name_list *) ((uint8_t *) a->kdbus_buffer + cmd.offset);
 
                 KDBUS_ITEM_FOREACH(name, name_list, names) {
                 name_list = (struct kdbus_name_list *) ((uint8_t *) a->kdbus_buffer + cmd.offset);
 
                 KDBUS_ITEM_FOREACH(name, name_list, names) {

+                        const char *entry_name = NULL;
+                        struct kdbus_item *item;

                         char *n;
 
                         char *n;
 

-                        if (name->size <= sizeof(*name))
-                                continue;
+                        KDBUS_ITEM_FOREACH(item, name, items)
+                                if (item->type == KDBUS_ITEM_NAME)
+                                        entry_name = item->str;

 
 

-                        if (!streq(name->name, arg0))
+                        if (!streq_ptr(entry_name, arg0))

                                 continue;
 
                         if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) {
                                 continue;
 
                         if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) {


@@ -779,7 +782,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 

-                if (service_name_is_valid(name) < 0)
+                if (!service_name_is_valid(name))

                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
 
                 if (streq(name, "org.freedesktop.DBus"))
                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
 
                 if (streq(name, "org.freedesktop.DBus"))


@@ -798,7 +801,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 

-                if (service_name_is_valid(name) < 0)
+                if (!service_name_is_valid(name))

                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
 
                 r = sd_bus_release_name(a, name);
                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
 
                 r = sd_bus_release_name(a, name);


@@ -828,7 +831,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 

-                if (service_name_is_valid(name) < 0)
+                if (!service_name_is_valid(name))

                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
                 if ((flags & ~(BUS_NAME_ALLOW_REPLACEMENT|BUS_NAME_REPLACE_EXISTING|BUS_NAME_DO_NOT_QUEUE)) != 0)
                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
                 if ((flags & ~(BUS_NAME_ALLOW_REPLACEMENT|BUS_NAME_REPLACE_EXISTING|BUS_NAME_DO_NOT_QUEUE)) != 0)
                         return synthetic_reply_method_errno(m, -EINVAL, NULL);


@@ -856,7 +859,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 

-                if (service_name_is_valid(name) < 0)
+                if (!service_name_is_valid(name))

                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
                 if (flags != 0)
                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
                         return synthetic_reply_method_errno(m, -EINVAL, NULL);
                 if (flags != 0)
                         return synthetic_reply_method_errno(m, -EINVAL, NULL);


@@ -1474,6 +1477,10 @@ int main(int argc, char *argv[]) {
         }
 
 finish:
         }
 
 finish:

+        sd_notify(false,
+                  "STOPPING=1\n"
+                  "STATUS=Shutting down.");
+

         policy_free(&policy);
         strv_free(arg_configuration);
         free(arg_address);
         policy_free(&policy);
         strv_free(arg_configuration);
         free(arg_address);