X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Fsd-login.c;h=5a03d614bb602fe0e3cad3d4e764a28b58d4aed9;hb=50b1678aaba9d3c2be5115db34a822911d791b8c;hp=e857ae08d2c8f73ecbcfc8105b6af1df10dd1b87;hpb=addedec48ba0ffc4472ef6d3b5a45c9d4239f1cd;p=elogind.git

diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index e857ae08d..5a03d614b 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -121,11 +121,12 @@ _public_ int sd_pid_get_session(pid_t pid, char **session) {
         return 0;
 }
 
-_public_ int sd_pid_get_service(pid_t pid, char **service) {
+_public_ int sd_pid_get_unit(pid_t pid, char **unit) {
         int r;
-        char *cgroup, *p;
+        char *cgroup, *p, *at, *b;
+        size_t k;
 
-        if (!service)
+        if (!unit)
                 return -EINVAL;
 
         r = pid_get_cgroup(pid, NULL, &cgroup);
@@ -138,13 +139,37 @@ _public_ int sd_pid_get_service(pid_t pid, char **service) {
         }
 
         p = cgroup + 8;
-        p = strndup(p, strcspn(p, "/"));
+        k = strcspn(p, "/");
+
+        at = memchr(p, '@', k);
+        if (at && at[1] == '.') {
+                size_t j;
+
+                /* This is a templated service */
+                if (p[k] != '/') {
+                        free(cgroup);
+                        return -EIO;
+                }
+
+                j = strcspn(p+k+1, "/");
+
+                b = malloc(k + j + 1);
+
+                if (b) {
+                        memcpy(b, p, at - p + 1);
+                        memcpy(b + (at - p) + 1, p + k + 1, j);
+                        memcpy(b + (at - p) + 1 + j, at + 1, k - (at - p) - 1);
+                        b[k+j] = 0;
+                }
+        } else
+                  b = strndup(p, k);
+
         free(cgroup);
 
-        if (!p)
+        if (!b)
                 return -ENOMEM;
 
-        *service = p;
+        *unit = b;
         return 0;
 }
 
@@ -329,17 +354,40 @@ _public_ int sd_uid_get_seats(uid_t uid, int require_active, char ***seats) {
         return uid_get_array(uid, require_active ? "ACTIVE_SEATS" : "SEATS", seats);
 }
 
-_public_ int sd_session_is_active(const char *session) {
+static int file_of_session(const char *session, char **_p) {
+        char *p;
         int r;
-        char *p, *s = NULL;
 
-        if (!session)
-                return -EINVAL;
+        assert(_p);
+
+        if (session)
+                p = strappend("/run/systemd/sessions/", session);
+        else {
+                char *buf;
+
+                r = sd_pid_get_session(0, &buf);
+                if (r < 0)
+                        return r;
+
+                p = strappend("/run/systemd/sessions/", buf);
+                free(buf);
+        }
 
-        p = strappend("/run/systemd/sessions/", session);
         if (!p)
                 return -ENOMEM;
 
+        *_p = p;
+        return 0;
+}
+
+_public_ int sd_session_is_active(const char *session) {
+        int r;
+        char *p, *s = NULL;
+
+        r = file_of_session(session, &p);
+        if (r < 0)
+                return r;
+
         r = parse_env_file(p, NEWLINE, "ACTIVE", &s, NULL);
         free(p);
 
@@ -361,14 +409,12 @@ _public_ int sd_session_get_uid(const char *session, uid_t *uid) {
         int r;
         char *p, *s = NULL;
 
-        if (!session)
-                return -EINVAL;
         if (!uid)
                 return -EINVAL;
 
-        p = strappend("/run/systemd/sessions/", session);
-        if (!p)
-                return -ENOMEM;
+        r = file_of_session(session, &p);
+        if (r < 0)
+                return r;
 
         r = parse_env_file(p, NEWLINE, "UID", &s, NULL);
         free(p);
@@ -391,14 +437,12 @@ _public_ int sd_session_get_seat(const char *session, char **seat) {
         char *p, *s = NULL;
         int r;
 
-        if (!session)
-                return -EINVAL;
         if (!seat)
                 return -EINVAL;
 
-        p = strappend("/run/systemd/sessions/", session);
-        if (!p)
-                return -ENOMEM;
+        r = file_of_session(session, &p);
+        if (r < 0)
+                return r;
 
         r = parse_env_file(p, NEWLINE, "SEAT", &s, NULL);
         free(p);
@@ -415,18 +459,68 @@ _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 (!service)
+                return -EINVAL;
+
+        r = file_of_session(session, &p);
+        if (r < 0)
+                return r;
+
+        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;
+}
+
+static int file_of_seat(const char *seat, char **_p) {
+        char *p;
+        int r;
+
+        assert(_p);
+
+        if (seat)
+                p = strappend("/run/systemd/seats/", seat);
+        else {
+                char *buf;
+
+                r = sd_session_get_seat(NULL, &buf);
+                if (r < 0)
+                        return r;
+
+                p = strappend("/run/systemd/seats/", buf);
+                free(buf);
+        }
+
+        if (!p)
+                return -ENOMEM;
+
+        *_p = p;
+        return 0;
+}
+
 _public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) {
         char *p, *s = NULL, *t = NULL;
         int r;
 
-        if (!seat)
-                return -EINVAL;
         if (!session && !uid)
                 return -EINVAL;
 
-        p = strappend("/run/systemd/seats/", seat);
-        if (!p)
-                return -ENOMEM;
+        r = file_of_seat(seat, &p);
+        if (r < 0)
+                return r;
 
         r = parse_env_file(p, NEWLINE,
                            "ACTIVE", &s,
@@ -475,12 +569,9 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
         unsigned n = 0;
         int r;
 
-        if (!seat)
-                return -EINVAL;
-
-        p = strappend("/run/systemd/seats/", seat);
-        if (!p)
-                return -ENOMEM;
+        r = file_of_seat(seat, &p);
+        if (r < 0)
+                return r;
 
         r = parse_env_file(p, NEWLINE,
                            "SESSIONS", &s,
@@ -566,12 +657,9 @@ _public_ int sd_seat_can_multi_session(const char *seat) {
         char *p, *s = NULL;
         int r;
 
-        if (!seat)
-                return -EINVAL;
-
-        p = strappend("/run/systemd/seats/", seat);
-        if (!p)
-                return -ENOMEM;
+        r = file_of_seat(seat, &p);
+        if (r < 0)
+                return r;
 
         r = parse_env_file(p, NEWLINE,
                            "CAN_MULTI_SESSION", &s,