From eff406331adb23e27e4bd29a3b69322fc359ca3d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 5 Jan 2012 23:14:22 +0100 Subject: [PATCH] login: implement sd_session_get_service() --- man/sd_session_is_active.xml | 22 ++++++++++++++++++++-- src/login/libsystemd-login.sym | 1 + src/login/sd-login.c | 28 ++++++++++++++++++++++++++++ src/systemd/sd-login.h | 3 +++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml index 88b22fd9..516275ea 100644 --- a/man/sd_session_is_active.xml +++ b/man/sd_session_is_active.xml @@ -46,6 +46,7 @@ sd_session_is_active sd_session_get_uid sd_session_get_seat + sd_session_get_service Determine state of a specific session @@ -69,6 +70,12 @@ const char* session char** seat + + + int sd_session_get_service + const char* session + char** service + @@ -94,6 +101,15 @@ returned string needs to be freed with the libc free3 call after use. + + sd_session_get_service() + may be used to determine the name of the service (as + passed during PAM session setup) that registered the + session identified by the specified session + identifier. The returned string needs to be freed with + the libc + free3 + call after use. @@ -102,7 +118,8 @@ If the test succeeds sd_session_is_active() returns a positive integer, if it fails 0. On success - sd_session_get_uid() and + sd_session_get_uid(), + sd_session_get_service() and sd_session_get_seat() return 0 or a positive integer. On failure, these calls return a negative errno-style error code. @@ -112,7 +129,8 @@ Notes The sd_session_is_active(), - sd_session_get_uid(), and + sd_session_get_uid(), + sd_session_get_service() and sd_session_get_seat() interfaces are available as shared library, which can be compiled and linked to with the diff --git a/src/login/libsystemd-login.sym b/src/login/libsystemd-login.sym index 15e505e8..3100c176 100644 --- a/src/login/libsystemd-login.sym +++ b/src/login/libsystemd-login.sym @@ -37,4 +37,5 @@ local: LIBSYSTEMD_LOGIN_38 { global: sd_pid_get_unit; + sd_session_get_service; } LIBSYSTEMD_LOGIN_31; diff --git a/src/login/sd-login.c b/src/login/sd-login.c index 8893b1de..ed984122 100644 --- a/src/login/sd-login.c +++ b/src/login/sd-login.c @@ -415,6 +415,34 @@ _public_ int sd_session_get_seat(const char *session, char **seat) { return 0; } +_public_ int sd_session_get_service(const char *session, char **service) { + char *p, *s = NULL; + int r; + + if (!session) + return -EINVAL; + if (!service) + return -EINVAL; + + p = strappend("/run/systemd/sessions/", session); + if (!p) + return -ENOMEM; + + r = parse_env_file(p, NEWLINE, "SERVICE", &s, NULL); + free(p); + + if (r < 0) { + free(s); + return r; + } + + if (isempty(s)) + return -ENOENT; + + *service = s; + return 0; +} + _public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) { char *p, *s = NULL, *t = NULL; int r; diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h index 00de6716..7d76f9a4 100644 --- a/src/systemd/sd-login.h +++ b/src/systemd/sd-login.h @@ -83,6 +83,9 @@ int sd_session_get_uid(const char *session, uid_t *uid); /* Determine seat of session */ 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); + /* Return active session and user of seat */ int sd_seat_get_active(const char *seat, char **session, uid_t *uid); -- 2.39.5