names: directly pass KDBUS_NAME_ACTIVATOR for activator requests

diff --git a/connection.c b/connection.c
index 0d00634c1981ccf6711291240891535bd3de633e..9dbe1a8ebee450e67dc676fc4c9d14aafe6bc423 100644 (file)
--- a/connection.c
+++ b/connection.c
@@ -1514,7 +1514,7 @@ int kdbus_conn_new(struct kdbus_ep *ep,
        conn->attach_flags = hello->attach_flags;
 
        if (activator_name) {
-               u64 flags = 0;
+               u64 flags = KDBUS_NAME_ACTIVATOR;
 
                ret = kdbus_name_acquire(bus->name_registry, conn,
                                         activator_name, &flags, NULL);

diff --git a/names.c b/names.c
index ee707185a4d348fc513e49d6b05001927f4a4e70..75d551de26f6cdeccd9eb73d6adb3c56fbc90414 100644 (file)
--- a/names.c
+++ b/names.c
@@ -439,10 +439,8 @@ int kdbus_name_acquire(struct kdbus_name_registry *reg,
                goto exit_unlock;
        }
 
-       if (conn->flags & KDBUS_HELLO_ACTIVATOR) {
+       if (conn->flags & KDBUS_HELLO_ACTIVATOR)
                e->activator = kdbus_conn_ref(conn);
-               *flags = KDBUS_NAME_ACTIVATOR;
-       }
 
        e->flags = *flags;
        INIT_LIST_HEAD(&e->queue_list);