summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-02-11 03:45:23 +0100
committerLennart Poettering <lennart@poettering.net>2012-02-13 23:50:02 +0100
commit50b1678aaba9d3c2be5115db34a822911d791b8c (patch)
tree19c891bcebda0d73b22f2a527cc3b5303010b59a /src
parent3d88c0a7d1b3acafdf5311a6081256bd90cc1103 (diff)
sd-login: if NULL or 0 is passed as first parameter of the sd_xxx functions, work on objects of the calling process
Diffstat (limited to 'src')
-rw-r--r--src/login/sd-login.c109
-rw-r--r--src/login/test-login.c5
2 files changed, 77 insertions, 37 deletions
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index eb1a4b910a..5a03d614bb 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -354,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);
@@ -386,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);
@@ -416,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);
@@ -444,14 +463,12 @@ _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 = file_of_session(session, &p);
+ if (r < 0)
+ return r;
r = parse_env_file(p, NEWLINE, "SERVICE", &s, NULL);
free(p);
@@ -468,18 +485,42 @@ _public_ int sd_session_get_service(const char *session, char **service) {
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,
@@ -528,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,
@@ -619,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,
diff --git a/src/login/test-login.c b/src/login/test-login.c
index ae041b6a59..4596721060 100644
--- a/src/login/test-login.c
+++ b/src/login/test-login.c
@@ -125,6 +125,11 @@ int main(int argc, char* argv[]) {
printf("seats = %s\n", t);
free(t);
+ r = sd_seat_get_active(NULL, &t, NULL);
+ assert_se(r >= 0);
+ printf("active session on current seat = %s\n", t);
+ free(t);
+
assert_se(sd_get_seats(NULL) == r);
r = sd_get_sessions(&sessions);