picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "bus: export bus address also when compiled without kdbus"

Browse source 
This reverts commit 9130f2128b.

It's too early to do that. For now we should only "break" the
--enable-kdbus case, not the normal one.
This commit is contained in:
Kay Sievers 2014-01-11 06:22:19 +08:00
parent 3860bb6dbf
commit 5eecd85f15
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/login/pam-module.c
View file

@ -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;
}