RomanNum3ral
/
ly
mirror of https://github.com/fairyglade/ly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

login.c: Move XDG initialization before opening the pam session 

As per https://www.freedesktop.org/wiki/Software/systemd/writing-display-managers/,
in order for logind to register the display manager and session using pam_systemd
(https://www.freedesktop.org/software/systemd/man/pam_systemd.html), the corresponding
XDG variables must be set prior to opening the pam session.

This change has no effect if the system is not configured to use pam_systemd.

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
This commit is contained in:
Roosembert Palacios 2019-10-26 09:14:25 +02:00
parent 757ec52217
commit 28b094febb
No known key found for this signature in database
GPG Key ID: CAAAECE5C2242BB7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/login.c
View File

@ -465,6 +465,8 @@ void auth(
const char* creds[2] = {login->text, password->text}; const char* creds[2] = {login->text, password->text};
struct pam_conv conv = {login_conv, creds}; struct pam_conv conv = {login_conv, creds};
struct pam_handle* handle; struct pam_handle* handle;
char tty_id [3];
snprintf(tty_id, 3, "%d", config.tty);
ok = pam_start(config.service_name, NULL, &conv, &handle); ok = pam_start(config.service_name, NULL, &conv, &handle);
@ -496,6 +498,8 @@ void auth(
return; return;
} }
// Set XDG variables to that pam_systemd can open the correct session type
env_xdg(tty_id, desktop->display_server[desktop->cur]);
ok = pam_do(pam_open_session, handle, 0, buf); ok = pam_do(pam_open_session, handle, 0, buf);
if (ok != PAM_SUCCESS) if (ok != PAM_SUCCESS)
@ -571,11 +575,9 @@ void auth(
// get a display // get a display
int display_id = get_free_display(); int display_id = get_free_display();
char display_name[3]; char display_name[3];
char tty_id [3];
char vt[5]; char vt[5];
snprintf(display_name, 3, ":%d", display_id); snprintf(display_name, 3, ":%d", display_id);
snprintf(tty_id, 3, "%d", config.tty);
snprintf(vt, 5, "vt%d", config.tty); snprintf(vt, 5, "vt%d", config.tty);
// set env // set env
@ -594,8 +596,6 @@ void auth(
putenv(env[i]); putenv(env[i]);
} }
// add xdg variables
env_xdg(tty_id, desktop->display_server[desktop->cur]);
// execute // execute
int ok = chdir(pwd->pw_dir); int ok = chdir(pwd->pw_dir);