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: v222~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5d452bb228e9f97ebc96be98a957c0b7b8072eb;p=thirdparty%2Fsystemd.git

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_systemd.c b/src/login/pam_systemd.c
index 0ebdfdf19e5..dd192b90ce0 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.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) {