AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2025-03-06 04:20:29 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

pam: work correctly if a seat is specified but not vtnr

Browse Source
This commit is contained in:
Lennart Poettering 2012-01-13 20:51:58 +01:00
parent d3f2bdbfee
commit fc7985ed67
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/login/pam-module.c
View File

@ -260,7 +260,6 @@ static int get_seat_from_display(const char *display, const char **seat, uint32_
int v;
assert(display);
assert(seat);
assert(vtnr);
/* We deduce the X11 socket from the display name, then use
@ -308,7 +307,8 @@ static int get_seat_from_display(const char *display, const char **seat, uint32_
else if (v == 0)
return -ENOENT;
*seat = "seat0";
if (seat)
*seat = "seat0";
*vtnr = (uint32_t) v;
return 0;
@ -455,8 +455,12 @@ _public_ PAM_EXTERN int pam_sm_open_session(
if (!isempty(cvtnr))
safe_atou32(cvtnr, &vtnr);
if (!isempty(display) && isempty(seat) && vtnr <= 0)
get_seat_from_display(display, &seat, &vtnr);
if (!isempty(display) && vtnr <= 0) {
if (isempty(seat))
get_seat_from_display(handle, display, &seat, &vtnr);
else if (streq(seat, "seat0"))
get_seat_from_display(handle, display, NULL, &vtnr);
}
type = !isempty(display) ? "x11" :
!isempty(tty) ? "tty" : "unspecified";