pam_systemd: Properly check kdbus availability

This properly avoids setting DBUS_SESSION_BUS_ADDRESS if kdbus
is loaded (or built into the kernel) but not wanted.

diff --git a/src/login/pam_elogind.c b/src/login/pam_elogind.c
index 9554ce6067c5fc1eccaf15bd0f3a5791d10fcf70..6f941f836fbb23094d14b20682eff49ef782a0d1 100644 (file)
--- a/src/login/pam_elogind.c
+++ b/src/login/pam_elogind.c
@@ -181,7 +181,7 @@ static int export_legacy_dbus_address(
         int r;
 
         /* skip export if kdbus is not active */
         int r;
 
         /* skip export if kdbus is not active */

-        if (access("/sys/fs/kdbus", F_OK) < 0)
+        if (!is_kdbus_available())

                 return PAM_SUCCESS;
 
         if (asprintf(&s, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, uid, runtime) < 0) {
                 return PAM_SUCCESS;
 
         if (asprintf(&s, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, uid, runtime) < 0) {