diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2016-06-10 09:50:16 -0400 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-16 10:12:59 +0200 |
| commit | 1879c3ef2a180da31c6419e3a50a7c80c547ce1a (patch) | |
| tree | 13fae4e53ec9121780868f12ef9973a7dcf01c93 /src | |
| parent | 1b4ba40d8ccab6a88013d7453e9ded91688934c8 (diff) | |
Ensure kdbus isn't used (#3501)
Delete the dbus1 generator and some critical wiring. This prevents
kdbus from being loaded or detected. As such, it will never be used,
even if the user still has a useful kdbus module loaded on their system.
Sort of fixes #3480. Not really, but it's better than the current state.
Diffstat (limited to 'src')
| -rw-r--r-- | src/login/pam_elogind.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/login/pam_elogind.c b/src/login/pam_elogind.c index 98dc20134..4f023640f 100644 --- a/src/login/pam_elogind.c +++ b/src/login/pam_elogind.c @@ -182,25 +182,20 @@ static int export_legacy_dbus_address( _cleanup_free_ char *s = NULL; int r = PAM_BUF_ERR; - if (is_kdbus_available()) { - if (asprintf(&s, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, uid, runtime) < 0) - goto error; - } else { - /* FIXME: We *really* should move the access() check into the - * daemons that spawn dbus-daemon, instead of forcing - * DBUS_SESSION_BUS_ADDRESS= here. */ - - s = strjoin(runtime, "/bus", NULL); - if (!s) - goto error; - - if (access(s, F_OK) < 0) - return PAM_SUCCESS; + /* FIXME: We *really* should move the access() check into the + * daemons that spawn dbus-daemon, instead of forcing + * DBUS_SESSION_BUS_ADDRESS= here. */ - s = mfree(s); - if (asprintf(&s, UNIX_USER_BUS_ADDRESS_FMT, runtime) < 0) - goto error; - } + s = strjoin(runtime, "/bus", NULL); + if (!s) + goto error; + + if (access(s, F_OK) < 0) + return PAM_SUCCESS; + + s = mfree(s); + if (asprintf(&s, UNIX_USER_BUS_ADDRESS_FMT, runtime) < 0) + goto error; r = pam_misc_setenv(handle, "DBUS_SESSION_BUS_ADDRESS", s, 0); if (r != PAM_SUCCESS) |