From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 15 Feb 2012 03:56:10 +0000 (+0100)
Subject: login: introduce sd_session_get_display()
X-Git-Tag: v43~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fc8af9ff3fbbbf21bf26f21d2eb100f26afc201a;hp=068665b6fd9839f27bcace7e8f56c0baa6935272

login: introduce sd_session_get_display()
---

diff --git a/src/login/libsystemd-login.sym b/src/login/libsystemd-login.sym
index 2ae376da4..a5e6c1e75 100644
--- a/src/login/libsystemd-login.sym
+++ b/src/login/libsystemd-login.sym
@@ -44,4 +44,5 @@ LIBSYSTEMD_LOGIN_43 {
 global:
         sd_session_get_type;
         sd_session_get_class;
+        sd_session_get_display;
 } LIBSYSTEMD_LOGIN_38;
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index c100a7b4f..887c42100 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -475,6 +475,10 @@ _public_ int sd_session_get_class(const char *session, char **class) {
         return session_get_string(session, "CLASS", class);
 }
 
+_public_ int sd_session_get_display(const char *session, char **display) {
+        return session_get_string(session, "DISPLAY", display);
+}
+
 static int file_of_seat(const char *seat, char **_p) {
         char *p;
         int r;
diff --git a/src/login/test-login.c b/src/login/test-login.c
index 2aaa31f22..dd8404285 100644
--- a/src/login/test-login.c
+++ b/src/login/test-login.c
@@ -30,7 +30,7 @@
 int main(int argc, char* argv[]) {
         int r, k;
         uid_t u, u2;
-        char *seat, *type, *class;
+        char *seat, *type, *class, *display;
         char *session;
         char *state;
         char *session2;
@@ -83,6 +83,10 @@ int main(int argc, char* argv[]) {
         printf("class = %s\n", class);
         free(class);
 
+        assert_se(sd_session_get_display(session, &display) >= 0);
+        printf("display = %s\n", display);
+        free(display);
+
         assert_se(sd_session_get_seat(session, &seat) >= 0);
         printf("seat = %s\n", seat);
 
diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
index 879e0744a..2f3c90c12 100644
--- a/src/systemd/sd-login.h
+++ b/src/systemd/sd-login.h
@@ -96,6 +96,9 @@ 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". */
 int sd_session_get_class(const char *session, char **class);
 
+/* Determine the X11 display of this session. */
+int sd_session_get_display(const char *session, char **display);
+
 /* Return active session and user of seat */
 int sd_seat_get_active(const char *seat, char **session, uid_t *uid);