From 5eecd85f15d35198807e6cd4b5ca5ec7dfdb11b3 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sat, 11 Jan 2014 06:22:19 +0800 Subject: [PATCH] Revert "bus: export bus address also when compiled without kdbus" This reverts commit 9130f2128b64de19a3b7d6db7e0d371adfd296c2. It's too early to do that. For now we should only "break" the --enable-kdbus case, not the normal one. --- src/login/pam-module.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/login/pam-module.c b/src/login/pam-module.c index ea606b7fc..e76fef800 100644 --- a/src/login/pam-module.c +++ b/src/login/pam-module.c @@ -169,28 +169,22 @@ static int export_legacy_dbus_address( uid_t uid, const char *runtime) { +#ifdef ENABLE_KDBUS _cleanup_free_ char *s = NULL; int r; -#ifdef ENABLE_KDBUS 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."); return PAM_BUF_ERR; } -#else - if (asprintf(&s, UNIX_USER_BUS_FMT, runtime) < 0) { - pam_syslog(handle, LOG_ERR, "Failed to set bus variable."); - return PAM_BUF_ERR; - } -#endif r = pam_misc_setenv(handle, "DBUS_SESSION_BUS_ADDRESS", s, 0); if (r != PAM_SUCCESS) { pam_syslog(handle, LOG_ERR, "Failed to set bus variable."); return r; } - +#endif return PAM_SUCCESS; } -- 2.30.2