diff options
| -rw-r--r-- | man/pam_systemd.xml | 23 | ||||
| -rw-r--r-- | man/sd_session_is_active.xml | 2 | ||||
| -rw-r--r-- | src/login/pam-module.c | 43 |
3 files changed, 52 insertions, 16 deletions
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index d3edc32d2..f312ef2b9 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -127,7 +127,28 @@ <listitem><para>Takes a string argument which sets the session class. The XDG_SESSION_CLASS environmental variable - takes precedence.</para></listitem> + takes precedence. One of + <literal>user</literal>, + <literal>greeter</literal>, + <literal>lock-screen</literal> or + <literal>background</literal>. See + <citerefentry><refentrytitle>sd_session_get_class</refentrytitle><manvolnum>3</manvolnum></citerefentry> + for details about the session class.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>type=</option></term> + + <listitem><para>Takes a string + argument which sets the session type. + The XDG_SESSION_TYPE environmental + variable takes precedence. One of + <literal>unspecified</literal>, + <literal>tty</literal>, + <literal>x11</literal> or + <literal>wayland</literal>. See + <citerefentry><refentrytitle>sd_session_get_type</refentrytitle><manvolnum>3</manvolnum></citerefentry> + for details about the session type.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml index bff6b04ea..4d5e6d113 100644 --- a/man/sd_session_is_active.xml +++ b/man/sd_session_is_active.xml @@ -201,7 +201,7 @@ be used to determine the type of the session identified by the specified session identifier. The returned string is one of <literal>x11</literal>, - <literal>tty</literal> or + <literal>wayland</literal>, <literal>tty</literal> or <literal>unspecified</literal> and needs to be freed with the libc <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry> diff --git a/src/login/pam-module.c b/src/login/pam-module.c index 18dd4e2e2..9f0f7d186 100644 --- a/src/login/pam-module.c +++ b/src/login/pam-module.c @@ -46,6 +46,7 @@ static int parse_argv( pam_handle_t *handle, int argc, const char **argv, const char **class, + const char **type, bool *debug) { unsigned i; @@ -53,11 +54,15 @@ static int parse_argv( assert(argc >= 0); assert(argc == 0 || argv); - for (i = 0; i < (unsigned) argc; i++) + for (i = 0; i < (unsigned) argc; i++) { if (startswith(argv[i], "class=")) { if (class) *class = argv[i] + 6; + } else if (startswith(argv[i], "type=")) { + if (type) + *type = argv[i] + 5; + } else if (streq(argv[i], "debug")) { if (debug) *debug = true; @@ -73,6 +78,7 @@ static int parse_argv( } else pam_syslog(handle, LOG_WARNING, "Unknown parameter '%s', ignoring", argv[i]); + } return 0; } @@ -206,7 +212,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( *remote_user = NULL, *remote_host = NULL, *seat = NULL, *type = NULL, *class = NULL, - *class_pam = NULL, *cvtnr = NULL; + *class_pam = NULL, *type_pam = NULL, *cvtnr = NULL; _cleanup_bus_unref_ sd_bus *bus = NULL; int session_fd = -1, existing, r; bool debug = false, remote; @@ -223,6 +229,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( if (parse_argv(handle, argc, argv, &class_pam, + &type_pam, &debug) < 0) return PAM_SESSION_ERR; @@ -284,6 +291,18 @@ _public_ PAM_EXTERN int pam_sm_open_session( if (isempty(cvtnr)) cvtnr = getenv("XDG_VTNR"); + type = pam_getenv(handle, "XDG_SESSION_TYPE"); + if (isempty(type)) + type = getenv("XDG_SESSION_TYPE"); + if (isempty(type)) + type = type_pam; + + class = pam_getenv(handle, "XDG_SESSION_CLASS"); + if (isempty(class)) + class = getenv("XDG_SESSION_CLASS"); + if (isempty(class)) + class = class_pam; + tty = strempty(tty); display = strempty(display); @@ -300,14 +319,16 @@ _public_ PAM_EXTERN int pam_sm_open_session( /* cron has been setting PAM_TTY to "cron" for a very * long time and it probably shouldn't stop doing that * for compatibility reasons. */ - tty = ""; type = "unspecified"; + class = "background"; + tty = ""; } else if (streq(tty, "ssh")) { /* ssh has been setting PAM_TTY to "ssh" for a very * long time and probably shouldn't stop doing that * for compatibility reasons. */ - tty = ""; type ="tty"; + class = "user"; + tty = ""; } /* If this fails vtnr will be 0, that's intended */ @@ -321,21 +342,15 @@ _public_ PAM_EXTERN int pam_sm_open_session( get_seat_from_display(display, NULL, &vtnr); } - if (seat && !streq(seat, "seat0")) { - pam_syslog(handle, LOG_DEBUG, - "Ignoring vtnr %d for %s which is not seat0", vtnr, seat); + if (seat && !streq(seat, "seat0") && vtnr != 0) { + pam_syslog(handle, LOG_DEBUG, "Ignoring vtnr %d for %s which is not seat0", vtnr, seat); vtnr = 0; } - if (!type) + if (isempty(type)) type = !isempty(display) ? "x11" : - !isempty(tty) ? "tty" : "unspecified"; + !isempty(tty) ? "tty" : "unspecified"; - class = pam_getenv(handle, "XDG_SESSION_CLASS"); - if (isempty(class)) - class = getenv("XDG_SESSION_CLASS"); - if (isempty(class)) - class = class_pam; if (isempty(class)) class = streq(type, "unspecified") ? "background" : "user"; |