From: Simon McVittie <smcv@collabora.com>
Date: Tue, 18 Feb 2025 10:37:28 +0000 (+0000)
Subject: selinux: Don't include unused reference count in verbose logging
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a57bb89673948be84dc39e9f0abb4fc82cfdd63e;p=thirdparty%2Fdbus.git

selinux: Don't include unused reference count in verbose logging

libselinux 3.8 includes an API break in which the `refcnt` field of
struct security_id_t (originally intended to be a reference count, but
in practice always initialized to 1 and never modified) was renamed and
repurposed as an `id` field. This caused a build failure if dbus was
compiled with both SELinux support and verbose mode, for example in the
instrumented debug build that Debian includes in the `dbus-tests` package.

This particular piece of debug logging has little value, so just
remove it.

Reference: https://github.com/SELinuxProject/selinux/commit/e5fd7b078fb8eb0b15eb5beaccd0e6a07ec26758
Bug-Debian: https://bugs.debian.org/1096212
Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/bus/selinux.c b/bus/selinux.c
index 200914b96..74d0e3476 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -925,7 +925,6 @@ bus_selinux_id_table_print (DBusHashTable *service_table)
       security_id_t sid = _dbus_hash_iter_get_value (&iter);
       _dbus_verbose ("The key is %s\n", key);
       _dbus_verbose ("The context is %s\n", sid->ctx);
-      _dbus_verbose ("The refcount is %d\n", sid->refcnt);
     }
 #endif /* DBUS_ENABLE_VERBOSE_MODE && HAVE_SELINUX */
 }