bus/containers: Indicate in loginfo whether connection is contained

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354

1 files changed, 26 insertions, 0 deletions

diff --git a/bus/connection.c b/bus/connection.c
index d53522f5..91b1966e 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -588,6 +588,9 @@ cache_peer_loginfo_string (BusConnectionData *d,
   unsigned long pid;
   char *windows_sid = NULL, *security_label = NULL;
   dbus_bool_t prev_added;
+  const char *container = NULL;
+  const char *container_type = NULL;
+  const char *container_name = NULL;
 
   if (!_dbus_string_init (&loginfo_buf))
     return FALSE;
@@ -659,6 +662,29 @@ cache_peer_loginfo_string (BusConnectionData *d,
         prev_added = TRUE;
     }
 
+  if (bus_containers_connection_is_contained (connection, &container,
+                                              &container_type,
+                                              &container_name))
+    {
+      dbus_bool_t did_append;
+
+      if (prev_added)
+        {
+          if (!_dbus_string_append_byte (&loginfo_buf, ' '))
+            goto oom;
+        }
+
+      did_append = _dbus_string_append_printf (&loginfo_buf,
+                                               "container=%s %s=\"%s\")",
+                                               container,
+                                               container_type,
+                                               container_name);
+      if (!did_append)
+        goto oom;
+      else
+        prev_added = TRUE;
+    }
+
   if (!_dbus_string_steal_data (&loginfo_buf, &(d->cached_loginfo_string)))
     goto oom;