From: Kay Sievers <kay@vrfy.org>
Date: Sat, 11 Jan 2014 17:18:41 +0000 (+0800)
Subject: pam: skip DBUS_SESSION_BUS_ADDRESS export when kdbus is not active
X-Git-Tag: v209~466
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8042e377b8bb8f79b7da2dff89d2247ce1f74b66;ds=sidebyside

pam: skip DBUS_SESSION_BUS_ADDRESS export when kdbus is not active
---

diff --git a/src/login/pam-module.c b/src/login/pam-module.c
index e76fef800..7400734fd 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -173,6 +173,10 @@ static int export_legacy_dbus_address(
         _cleanup_free_ char *s = NULL;
         int r;
 
+        /* skip export if kdbus is not active */
+        if (access("/dev/kdbus", F_OK) < 0)
+                return PAM_SUCCESS;
+
         if (asprintf(&s, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT,
                      (unsigned long) uid, runtime) < 0) {
                 pam_syslog(handle, LOG_ERR, "Failed to set bus variable.");