use KDBUS_ITEM_NAME instead of KDBUS_ITEM_ACTIVATOR_NAME

diff --git a/connection.c b/connection.c
index abf3b489b49586c7f60869c1d3c215274eca75c1..408939028e6994891128198aa9e9a8dc42001718 100644 (file)
--- a/connection.c
+++ b/connection.c
@@ -1417,7 +1417,7 @@ int kdbus_conn_new(struct kdbus_ep *ep,
 
        KDBUS_ITEM_FOREACH(item, hello, items) {
                switch (item->type) {
-               case KDBUS_ITEM_ACTIVATOR_NAME:
+               case KDBUS_ITEM_NAME:
                        if (!(hello->conn_flags & KDBUS_HELLO_ACTIVATOR))
                                return -EINVAL;
 

diff --git a/kdbus.h b/kdbus.h
index fd9ca2d5fc886c10372aee35226882343c57fcab..972a02df8d9246ad10f2e663ed69c180120e0666 100644 (file)
--- a/kdbus.h
+++ b/kdbus.h
@@ -207,7 +207,6 @@ struct kdbus_policy {
  * @KDBUS_ITEM_POLICY_NAME:    Policy in struct kdbus_policy
  * @KDBUS_ITEM_POLICY_ACCESS:  Policy in struct kdbus_policy
  * @KDBUS_ITEM_NAME:           Well-know name with flags
- * @KDBUS_ITEM_ACTIVATOR_NAME: Well-known name for the activator
  * @KDBUS_ITEM_TIMESTAMP:      Timestamp
  * @KDBUS_ITEM_CREDS:          Process credential
  * @KDBUS_ITEM_PID_COMM:       Process ID "comm" identifier
@@ -244,7 +243,6 @@ enum kdbus_item_type {
 
        _KDBUS_ITEM_ATTACH_BASE = 0x600,
        KDBUS_ITEM_NAME         = _KDBUS_ITEM_ATTACH_BASE,
-       KDBUS_ITEM_ACTIVATOR_NAME,
        KDBUS_ITEM_TIMESTAMP,
        KDBUS_ITEM_CREDS,
        KDBUS_ITEM_PID_COMM,

diff --git a/names.c b/names.c
index c9f85a3ee71aef53027f34b1d6dcc9aa59a5d312..390e798f44b85a2c12108968c4d4c33a4d780f51 100644 (file)
--- a/names.c
+++ b/names.c
@@ -685,7 +685,6 @@ static int kdbus_name_list_write(struct kdbus_conn *conn,
        return 0;
 }
 
-
 static int kdbus_name_list_all(struct kdbus_conn *conn, u64 flags,
                               size_t *pos, bool write)
 {

diff --git a/test/test-kdbus-activator.c b/test/test-kdbus-activator.c
index 3774bcf48caf2006d467839f293a6435d6a57890..d5d5f319eed2ac6cdc0c456e1364318bb184f65d 100644 (file)
--- a/test/test-kdbus-activator.c
+++ b/test/test-kdbus-activator.c
@@ -43,7 +43,7 @@ static struct conn *make_activator(const char *path, const char *name)
 
        item = hello->items;
        item->size = KDBUS_ITEM_SIZE(slen);
-       item->type = KDBUS_ITEM_ACTIVATOR_NAME;
+       item->type = KDBUS_ITEM_NAME;
        strcpy(item->str, name);
 
        ret = ioctl(fd, KDBUS_CMD_HELLO, hello);