pam_systemd: set $DBUS_SESSION_BUS_ADDRESS unconditionally
There's very little lost if the variable is set for a socket that isn't connectible, but a lot lost (races, ...) if it's not set but the socket exists. Also, drop the FIXME note, since we don't plan to revert this revert any time soon.
This commit is contained in:
parent
00efd4988b
commit
69bd76f2b9
|
@ -198,18 +198,6 @@ static int export_legacy_dbus_address(
|
|||
_cleanup_free_ char *s = NULL;
|
||||
int r = PAM_BUF_ERR;
|
||||
|
||||
/* 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");
|
||||
if (!s)
|
||||
goto error;
|
||||
|
||||
if (access(s, F_OK) < 0)
|
||||
return PAM_SUCCESS;
|
||||
|
||||
s = mfree(s);
|
||||
if (asprintf(&s, DEFAULT_USER_BUS_ADDRESS_FMT, runtime) < 0)
|
||||
goto error;
|
||||
|
||||
|
|
Loading…
Reference in a new issue