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

kdbus.h now has KDBUS_ATTACH_COMM split into KDBUS_ATTACH_TID_COMM and
KDBUS_ATTACH_PID_COMM. The items were split already, so the change in
systemd is easy.

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index ac0ae5366eb0e497214c445dbf79b40bb29099d8..c8340718988f25e67639bf99657e95cd7ab3a343 100644 (file)
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1235,8 +1235,11 @@ int kdbus_translate_attach_flags(uint64_t mask, uint64_t *kdbus_mask) {
         if (mask & (SD_BUS_CREDS_UID|SD_BUS_CREDS_GID|SD_BUS_CREDS_PID|SD_BUS_CREDS_PID_STARTTIME|SD_BUS_CREDS_TID))
                 m |= KDBUS_ATTACH_CREDS;
 
         if (mask & (SD_BUS_CREDS_UID|SD_BUS_CREDS_GID|SD_BUS_CREDS_PID|SD_BUS_CREDS_PID_STARTTIME|SD_BUS_CREDS_TID))
                 m |= KDBUS_ATTACH_CREDS;
 

-        if (mask & (SD_BUS_CREDS_COMM|SD_BUS_CREDS_TID_COMM))
-                m |= KDBUS_ATTACH_COMM;
+        if (mask & SD_BUS_CREDS_COMM)
+                m |= KDBUS_ATTACH_PID_COMM;
+
+        if (mask & SD_BUS_CREDS_TID_COMM)
+                m |= KDBUS_ATTACH_TID_COMM;

 
         if (mask & SD_BUS_CREDS_EXE)
                 m |= KDBUS_ATTACH_EXE;
 
         if (mask & SD_BUS_CREDS_EXE)
                 m |= KDBUS_ATTACH_EXE;

diff --git a/src/libsystemd/sd-bus/kdbus.h b/src/libsystemd/sd-bus/kdbus.h
index 453a8d18bc4e6286b07db0b622e7611fccfa64e1..e1fa21dee0d9b1fa11e33cff1d7d5ea1f760b8a9 100644 (file)
--- a/src/libsystemd/sd-bus/kdbus.h
+++ b/src/libsystemd/sd-bus/kdbus.h
@@ -526,7 +526,8 @@ enum kdbus_hello_flags {
  * @KDBUS_ATTACH_CREDS:                Credentials
  * @KDBUS_ATTACH_AUXGROUPS:    Auxiliary groups
  * @KDBUS_ATTACH_NAMES:                Well-known names
  * @KDBUS_ATTACH_CREDS:                Credentials
  * @KDBUS_ATTACH_AUXGROUPS:    Auxiliary groups
  * @KDBUS_ATTACH_NAMES:                Well-known names

- * @KDBUS_ATTACH_COMM:         The "comm" process identifier
+ * @KDBUS_ATTACH_COMM_TID:     The "comm" process identifier of the TID
+ * @KDBUS_ATTACH_COMM_PID:     The "comm" process identifier of the PID

  * @KDBUS_ATTACH_EXE:          The path of the executable
  * @KDBUS_ATTACH_CMDLINE:      The process command line
  * @KDBUS_ATTACH_CGROUP:       The croup membership
  * @KDBUS_ATTACH_EXE:          The path of the executable
  * @KDBUS_ATTACH_CMDLINE:      The process command line
  * @KDBUS_ATTACH_CGROUP:       The croup membership


@@ -541,15 +542,16 @@ enum kdbus_attach_flags {
        KDBUS_ATTACH_CREDS              =  1ULL <<  1,
        KDBUS_ATTACH_AUXGROUPS          =  1ULL <<  2,
        KDBUS_ATTACH_NAMES              =  1ULL <<  3,
        KDBUS_ATTACH_CREDS              =  1ULL <<  1,
        KDBUS_ATTACH_AUXGROUPS          =  1ULL <<  2,
        KDBUS_ATTACH_NAMES              =  1ULL <<  3,

-       KDBUS_ATTACH_COMM               =  1ULL <<  4,
-       KDBUS_ATTACH_EXE                =  1ULL <<  5,
-       KDBUS_ATTACH_CMDLINE            =  1ULL <<  6,
-       KDBUS_ATTACH_CGROUP             =  1ULL <<  7,
-       KDBUS_ATTACH_CAPS               =  1ULL <<  8,
-       KDBUS_ATTACH_SECLABEL           =  1ULL <<  9,
-       KDBUS_ATTACH_AUDIT              =  1ULL << 10,
-       KDBUS_ATTACH_CONN_NAME          =  1ULL << 11,
-       _KDBUS_ATTACH_ALL               =  (1ULL << 12) - 1,
+       KDBUS_ATTACH_TID_COMM           =  1ULL <<  4,
+       KDBUS_ATTACH_PID_COMM           =  1ULL <<  5,
+       KDBUS_ATTACH_EXE                =  1ULL <<  6,
+       KDBUS_ATTACH_CMDLINE            =  1ULL <<  7,
+       KDBUS_ATTACH_CGROUP             =  1ULL <<  8,
+       KDBUS_ATTACH_CAPS               =  1ULL <<  9,
+       KDBUS_ATTACH_SECLABEL           =  1ULL << 10,
+       KDBUS_ATTACH_AUDIT              =  1ULL << 11,
+       KDBUS_ATTACH_CONN_NAME          =  1ULL << 12,
+       _KDBUS_ATTACH_ALL               =  (1ULL << 13) - 1,

 };
 
 /**
 };
 
 /**