diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2018-06-08 08:30:56 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-06-08 16:45:49 +0200 |
| commit | 34ff9b3412613ed6f1c1ad56c2915309bac6a541 (patch) | |
| tree | fce8dd54909ef9cd259119b27ab3b3298e74f976 /src | |
| parent | 7874bff7a506ee2b442e294f81e9d06dba739e9e (diff) | |
pam_elogind.c: Remove renames by mask, check_tree.pl can handle this now.
(cherry picked from commit 6964ec46218d41d699690ed590026249969b2257)
Diffstat (limited to 'src')
| -rw-r--r-- | src/login/pam_elogind.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/login/pam_elogind.c b/src/login/pam_elogind.c index b1e678d2b..dfd352495 100644 --- a/src/login/pam_elogind.c +++ b/src/login/pam_elogind.c @@ -249,11 +249,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( return PAM_SESSION_ERR; if (debug) -#if 0 /// This is pam-elogind, not pam-systemd - pam_syslog(handle, LOG_DEBUG, "pam-systemd initializing"); -#else pam_syslog(handle, LOG_DEBUG, "pam-elogind initializing"); -#endif // 0 r = get_user_data(handle, &username, &pw); if (r != PAM_SUCCESS) { @@ -262,17 +258,13 @@ _public_ PAM_EXTERN int pam_sm_open_session( } /* Make sure we don't enter a loop by talking to - * systemd-logind when it is actually waiting for the + * elogind when it is actually waiting for the * background to finish start-up. If the service is - * "systemd-user" we simply set XDG_RUNTIME_DIR and + * "elogind-user" we simply set XDG_RUNTIME_DIR and * leave. */ pam_get_item(handle, PAM_SERVICE, (const void**) &service); -#if 0 /// Actually it is elogind-user with elogind. - if (streq_ptr(service, "systemd-user")) { -#else if (streq_ptr(service, "elogind-user")) { -#endif // 0 _cleanup_free_ char *rt = NULL; if (asprintf(&rt, "/run/user/"UID_FMT, pw->pw_uid) < 0) |