From: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: Sun, 21 Jun 2015 03:59:34 +0000 (+0200)
Subject: pam_systemd: Properly check kdbus availability
X-Git-Tag: v226.4~1^2~263
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c7f1a65b0b5f16d1e12ec42c5578fd9850611147;ds=sidebyside

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 9554ce606..6f941f836 100644
--- 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 */
-        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) {