diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-04-09 21:22:48 +0200 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2014-04-09 21:22:48 +0200 |
| commit | 9541666b8d97f107335dd7e3cb93b4d2cfbf19c9 (patch) | |
| tree | 4c4b424ca5c6c73286a623a18020e1711cbe3c24 | |
| parent | 13468826f2457cae45a79649e122deadb9dc9774 (diff) | |
login: add 'mir' to the list of session types
Add Mir to the list of session types. This is implemented for LightDM
in lp:~robert-ancell/lightdm/xdg-session-desktop [1].
[1] https://code.launchpad.net/~robert-ancell/lightdm/xdg-session-desktop/+merge/214108
(david: adjusted commit-header and fixed whitespace issues)
| -rw-r--r-- | man/pam_systemd.xml | 5 | ||||
| -rw-r--r-- | man/sd_session_is_active.xml | 6 | ||||
| -rw-r--r-- | src/login/logind-session.c | 1 | ||||
| -rw-r--r-- | src/login/logind-session.h | 1 | ||||
| -rw-r--r-- | src/systemd/sd-login.h | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index 3022cdb6f5..f973899b2f 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -145,8 +145,9 @@ variable takes precedence. One of <literal>unspecified</literal>, <literal>tty</literal>, - <literal>x11</literal> or - <literal>wayland</literal>. See + <literal>x11</literal>, + <literal>wayland</literal> or + <literal>mir</literal>. See <citerefentry><refentrytitle>sd_session_get_type</refentrytitle><manvolnum>3</manvolnum></citerefentry> for details about the session type.</para></listitem> </varlistentry> diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml index ddb2bee5e1..31a611996e 100644 --- a/man/sd_session_is_active.xml +++ b/man/sd_session_is_active.xml @@ -201,9 +201,9 @@ 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>wayland</literal>, <literal>tty</literal> or - <literal>unspecified</literal> and needs to be freed - with the libc + <literal>wayland</literal>, <literal>tty</literal>, + <literal>mir</literal> or <literal>unspecified</literal> and + needs to be freed with the libc <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry> call after use.</para> diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 4ca6b5d805..b4fd349f00 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -1117,6 +1117,7 @@ static const char* const session_type_table[_SESSION_TYPE_MAX] = { [SESSION_TTY] = "tty", [SESSION_X11] = "x11", [SESSION_WAYLAND] = "wayland", + [SESSION_MIR] = "mir", }; DEFINE_STRING_TABLE_LOOKUP(session_type, SessionType); diff --git a/src/login/logind-session.h b/src/login/logind-session.h index c9af5ebe0d..7ecc9f0d4f 100644 --- a/src/login/logind-session.h +++ b/src/login/logind-session.h @@ -55,6 +55,7 @@ typedef enum SessionType { SESSION_TTY, SESSION_X11, SESSION_WAYLAND, + SESSION_MIR, _SESSION_TYPE_MAX, _SESSION_TYPE_INVALID = -1 } SessionType; diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h index a4ca231174..776733ad1d 100644 --- a/src/systemd/sd-login.h +++ b/src/systemd/sd-login.h @@ -138,7 +138,7 @@ int sd_session_get_seat(const char *session, char **seat); /* Determine the (PAM) service name this session was registered by. */ int sd_session_get_service(const char *session, char **service); -/* Determine the type of this session, i.e. one of "tty", "x11" or "unspecified". */ +/* Determine the type of this session, i.e. one of "tty", "x11", "wayland", "mir" or "unspecified". */ int sd_session_get_type(const char *session, char **type); /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */ |