diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-01-06 08:00:16 +0400 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-01-08 18:11:37 +0800 |
| commit | 8b255ecd99dfee4e27b40a075b15d1e117f819fa (patch) | |
| tree | 29e06155680211970985f3b760806edd3acecf68 /src/login | |
| parent | bc6422cbd1dfc258fb2b4909a2a25ad356e63400 (diff) | |
pam_systemd: export DBUS_SESSION_BUS_ADDRESS
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/pam-module.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/login/pam-module.c b/src/login/pam-module.c index 89623aa765..c67e677384 100644 --- a/src/login/pam-module.c +++ b/src/login/pam-module.c @@ -164,6 +164,30 @@ static int get_seat_from_display(const char *display, const char **seat, uint32_ return 0; } +static int export_legacy_dbus_address( + pam_handle_t *handle, + uid_t uid, + const char *runtime) { + +#ifdef ENABLE_KDBUS + _cleanup_free_ char *s = NULL; + int r; + + if (asprintf(&s, "kernel:path=/dev/kdbus/%lu-user/bus;unix:path=%s/bus", + (unsigned long) uid, runtime) < 0) { + pam_syslog(handle, LOG_ERR, "Failed to set bus variable."); + return PAM_BUF_ERR; + } + + 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; +} + _public_ PAM_EXTERN int pam_sm_open_session( pam_handle_t *handle, int flags, @@ -232,6 +256,10 @@ _public_ PAM_EXTERN int pam_sm_open_session( pam_syslog(handle, LOG_ERR, "Failed to set runtime dir."); return r; } + + r = export_legacy_dbus_address(handle, pw->pw_uid, rt); + if (r != PAM_SUCCESS) + return r; } return PAM_SUCCESS; @@ -386,6 +414,10 @@ _public_ PAM_EXTERN int pam_sm_open_session( pam_syslog(handle, LOG_ERR, "Failed to set runtime dir."); return r; } + + r = export_legacy_dbus_address(handle, pw->pw_uid, runtime_path); + if (r != PAM_SUCCESS) + return r; } if (!isempty(seat)) { |