Blame SOURCES/kde-workspace-4.11.1-kdm-logind-multiseat.patch

b5cc75
diff -up kde-workspace-4.10.90/CMakeLists.txt.kdm_logind kde-workspace-4.10.90/CMakeLists.txt
b5cc75
--- kde-workspace-4.10.90/CMakeLists.txt.kdm_logind	2013-06-27 16:27:30.199895076 -0500
b5cc75
+++ kde-workspace-4.10.90/CMakeLists.txt	2013-06-27 16:30:25.167008304 -0500
b5cc75
@@ -128,6 +128,13 @@ if(Q_WS_X11)
b5cc75
   endif()
b5cc75
 endif(Q_WS_X11)
b5cc75
 
b5cc75
+macro_optional_find_package(Systemd)
b5cc75
+set_package_properties(Systemd PROPERTIES DESCRIPTION "Init and service manager for Linux"
b5cc75
+                       URL "http://www.freedesktop.org/wiki/Software/systemd"
b5cc75
+                       TYPE OPTIONAL
b5cc75
+                       PURPOSE "Provides automatic multi-seat, session and power management features"
b5cc75
+                      )
b5cc75
+
b5cc75
 macro_optional_find_package(GLIB2 2.0)
b5cc75
 set_package_properties(GLIB2 PROPERTIES DESCRIPTION "Low-level core library for data structure handling, portability wrappers, etc."
b5cc75
                        URL "http://www.gtk.org"
b5cc75
diff -up kde-workspace-4.10.90/cmake/modules/CMakeLists.txt.kdm_logind kde-workspace-4.10.90/cmake/modules/CMakeLists.txt
b5cc75
--- kde-workspace-4.10.90/cmake/modules/CMakeLists.txt.kdm_logind	2013-06-10 13:51:11.000000000 -0500
b5cc75
+++ kde-workspace-4.10.90/cmake/modules/CMakeLists.txt	2013-06-27 16:27:30.199895076 -0500
b5cc75
@@ -8,6 +8,7 @@ set(cmakeFiles FindCkConnector.cmake
b5cc75
                FindOpenGLES.cmake
b5cc75
                FindPAM.cmake
b5cc75
                FindSensors.cmake
b5cc75
+               FindSystemd.cmake
b5cc75
                PkgConfigGetVar.cmake
b5cc75
                UnixAuth.cmake )
b5cc75
 
b5cc75
diff -up kde-workspace-4.10.90/cmake/modules/FindSystemd.cmake.kdm_logind kde-workspace-4.10.90/cmake/modules/FindSystemd.cmake
b5cc75
--- kde-workspace-4.10.90/cmake/modules/FindSystemd.cmake.kdm_logind	2013-06-27 16:27:30.200895065 -0500
b5cc75
+++ kde-workspace-4.10.90/cmake/modules/FindSystemd.cmake	2013-06-27 16:27:30.200895065 -0500
b5cc75
@@ -0,0 +1,39 @@
b5cc75
+# Finds systemd and its libraries
b5cc75
+# Not a huge module but sufficient for now
b5cc75
+# Uses the same semantics as pkg_check_modules, i.e. ${LIB}{_FOUND,_INCLUDE_DIR,_LIBRARIES}
b5cc75
+# where ${LIB} can be one of the following:
b5cc75
+#     LIBSYSTEMD_JOURNAL, SYSTEMD, LIBSYSTEMD_DAEMON, LIBSYSTEMD_LOGIN, LIBSYSTEMD_ID128
b5cc75
+#
b5cc75
+# Copyright: Red Hat, Inc. 2013
b5cc75
+# Author: Martin Briza <mbriza@redhat.com>
b5cc75
+#
b5cc75
+# Distributed under the BSD license. See COPYING-CMAKE-SCRIPTS for details.
b5cc75
+
b5cc75
+#defining any of these disables systemd support
b5cc75
+if (NOT LIBSYSTEMD_JOURNAL_FOUND AND
b5cc75
+    NOT SYSTEMD_FOUND AND
b5cc75
+    NOT LIBSYSTEMD_DAEMON_FOUND AND
b5cc75
+    NOT LIBSYSTEMD_LOGIN_FOUND AND
b5cc75
+    NOT LIBSYSTEMD_ID128_FOUND)
b5cc75
+find_package(PkgConfig)
b5cc75
+if (PKG_CONFIG_FOUND)
b5cc75
+    pkg_check_modules(LIBSYSTEMD_JOURNAL QUIET "libsystemd-journal")
b5cc75
+    pkg_check_modules(SYSTEMD QUIET "systemd")
b5cc75
+    pkg_check_modules(LIBSYSTEMD_DAEMON QUIET "libsystemd-daemon")
b5cc75
+    pkg_check_modules(LIBSYSTEMD_LOGIN QUIET "libsystemd-login")
b5cc75
+    pkg_check_modules(LIBSYSTEMD_ID128 QUIET "libsystemd-id128")
b5cc75
+endif (PKG_CONFIG_FOUND)
b5cc75
+
b5cc75
+if (SYSTEMD_FOUND)
b5cc75
+    message(STATUS "Found systemd")
b5cc75
+endif(SYSTEMD_FOUND)
b5cc75
+
b5cc75
+mark_as_advanced(LIBSYSTEMD_JOURNAL_FOUND       SYSTEMD_FOUND       LIBSYSTEMD_DAEMON_FOUND       LIBSYSTEMD_LOGIN_FOUND       LIBSYSTEMD_ID128_FOUND)
b5cc75
+mark_as_advanced(LIBSYSTEMD_JOURNAL_INCLUDE_DIR SYSTEMD_INCLUDE_DIR LIBSYSTEMD_DAEMON_INCLUDE_DIR LIBSYSTEMD_LOGIN_INCLUDE_DIR LIBSYSTEMD_ID128_INCLUDE_DIR)
b5cc75
+mark_as_advanced(LIBSYSTEMD_JOURNAL_LIBRARIES   SYSTEMD_LIBRARIES   LIBSYSTEMD_DAEMON_LIBRARIES   LIBSYSTEMD_LOGIN_LIBRARIES   LIBSYSTEMD_ID128_LIBRARIES)
b5cc75
+
b5cc75
+endif (NOT LIBSYSTEMD_JOURNAL_FOUND AND
b5cc75
+       NOT SYSTEMD_FOUND AND
b5cc75
+       NOT LIBSYSTEMD_DAEMON_FOUND AND
b5cc75
+       NOT LIBSYSTEMD_LOGIN_FOUND AND
b5cc75
+       NOT LIBSYSTEMD_ID128_FOUND)
b5cc75
diff -up kde-workspace-4.10.90/kdm/backend/CMakeLists.txt.kdm_logind kde-workspace-4.10.90/kdm/backend/CMakeLists.txt
b5cc75
--- kde-workspace-4.10.90/kdm/backend/CMakeLists.txt.kdm_logind	2013-05-28 13:38:21.000000000 -0500
b5cc75
+++ kde-workspace-4.10.90/kdm/backend/CMakeLists.txt	2013-06-27 16:27:30.201895054 -0500
b5cc75
@@ -45,6 +45,10 @@ if (SECURE_RPC)
b5cc75
 		rpcauth.c
b5cc75
 	)
b5cc75
 endif (SECURE_RPC)
b5cc75
+if(LIBSYSTEMD_LOGIN_FOUND AND LIBSYSTEMD_DAEMON_FOUND)
b5cc75
+    add_definitions( -DWITH_SYSTEMD=1 )
b5cc75
+    set(KDM_SYSTEMD_LIBRARIES ${LIBSYSTEMD_DAEMON_LIBRARIES} ${LIBSYSTEMD_LOGIN_LIBRARIES} )
b5cc75
+endif(LIBSYSTEMD_LOGIN_FOUND AND LIBSYSTEMD_DAEMON_FOUND)
b5cc75
 macro_add_file_dependencies(dm.h ${confci})
b5cc75
 macro_add_file_dependencies(error.c ${CMAKE_CURRENT_SOURCE_DIR}/printf.c)
b5cc75
 kde4_add_executable(kdm NOGUI ${kdm_SRCS})
b5cc75
@@ -61,6 +65,7 @@ target_link_libraries( kdm
b5cc75
 	${NSL_LIBRARIES}
b5cc75
 	${RESOLV_LIBRARIES}
b5cc75
 	${SOCKET_LIBRARIES}
b5cc75
+	${KDM_SYSTEMD_LIBRARIES}
b5cc75
 )
b5cc75
 if (CKCONNECTOR_FOUND)
b5cc75
 	include_directories(${CKCONNECTOR_INCLUDE_DIR} ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
b5cc75
diff -up kde-workspace-4.10.90/kdm/backend/dm.c.kdm_logind kde-workspace-4.10.90/kdm/backend/dm.c
b5cc75
--- kde-workspace-4.10.90/kdm/backend/dm.c.kdm_logind	2013-06-27 16:27:30.184895241 -0500
b5cc75
+++ kde-workspace-4.10.90/kdm/backend/dm.c	2013-06-27 16:27:30.201895054 -0500
b5cc75
@@ -50,6 +50,23 @@ from the copyright holder.
b5cc75
 # include <sys/vt.h>
b5cc75
 #endif
b5cc75
 
b5cc75
+#ifdef WITH_SYSTEMD
b5cc75
+# include <systemd/sd-login.h>
b5cc75
+# include <systemd/sd-daemon.h>
b5cc75
+
b5cc75
+#define SYSTEMD_FAILURE_LIMIT 25
b5cc75
+
b5cc75
+ static int systemdMonitorInit(void);
b5cc75
+ static void systemdMonitorDeinit();
b5cc75
+ static int systemdStartDisplay(char *);
b5cc75
+ static void systemdCheckAdded(char **);
b5cc75
+ static void systemdCheckRemoved(char **);
b5cc75
+ static void systemdHandleChange();
b5cc75
+
b5cc75
+ sd_login_monitor *systemd_monitor = NULL;
b5cc75
+ int systemd_monitor_fd = -1;
b5cc75
+#endif
b5cc75
+
b5cc75
 static void sigHandler(int n);
b5cc75
 static int scanConfigs(int force);
b5cc75
 static void startDisplay(struct display *d);
b5cc75
@@ -308,7 +325,16 @@ main(int argc, char **argv)
b5cc75
 #ifdef XDMCP
b5cc75
     updateListenSockets();
b5cc75
 #endif
b5cc75
+
b5cc75
+#ifdef WITH_SYSTEMD
b5cc75
+    if (systemdMonitorInit())
b5cc75
+        systemdHandleChange();
b5cc75
+#endif
b5cc75
+
b5cc75
     mainLoop();
b5cc75
+#ifdef WITH_SYSTEMD
b5cc75
+    systemdMonitorDeinit();
b5cc75
+#endif
b5cc75
     closeCtrl(0);
b5cc75
     if (sdRec.how) {
b5cc75
         int pid;
b5cc75
@@ -1280,6 +1306,14 @@ mainLoop(void)
b5cc75
                 }
b5cc75
                 continue;
b5cc75
             }
b5cc75
+                logError("STARTING");
b5cc75
+#ifdef WITH_SYSTEMD
b5cc75
+            if (systemd_monitor_fd >= 0 && FD_ISSET(systemd_monitor_fd, &reads)) {
b5cc75
+                systemdHandleChange();
b5cc75
+                sd_login_monitor_flush(systemd_monitor);
b5cc75
+                continue;
b5cc75
+            }
b5cc75
+#endif
b5cc75
 #ifdef XDMCP
b5cc75
             if (processListenSockets(&reads))
b5cc75
                 continue;
b5cc75
@@ -1304,6 +1338,151 @@ mainLoop(void)
b5cc75
     }
b5cc75
 }
b5cc75
 
b5cc75
+#ifdef WITH_SYSTEMD
b5cc75
+static int
b5cc75
+systemdMonitorInit(void)
b5cc75
+{
b5cc75
+    if (sd_booted() <= 0) {
b5cc75
+        logError("Didn't boot with systemd, automatic multiseat won't be enabled\n");
b5cc75
+        return False;
b5cc75
+    }
b5cc75
+
b5cc75
+    int check = sd_login_monitor_new("seat", &systemd_monitor);
b5cc75
+    if (check < 0) {
b5cc75
+        logError("Can't get systemd monitor: %d, automatic multiseat won't be enabled\n", check);
b5cc75
+        return False;
b5cc75
+    }
b5cc75
+
b5cc75
+    systemd_monitor_fd = sd_login_monitor_get_fd(systemd_monitor);
b5cc75
+    if (systemd_monitor_fd < 0) {
b5cc75
+        logError("Can't retrieve file descriptor from the systemd monitor: %d, automatic multiseat won't be enabled\n", systemd_monitor_fd);
b5cc75
+        sd_login_monitor_unref(systemd_monitor);
b5cc75
+        systemd_monitor_fd = -1;
b5cc75
+        return False;
b5cc75
+    }
b5cc75
+
b5cc75
+    registerInput(systemd_monitor_fd);
b5cc75
+    return True;
b5cc75
+}
b5cc75
+
b5cc75
+static void
b5cc75
+systemdMonitorDeinit(void)
b5cc75
+{
b5cc75
+    if (systemd_monitor) {
b5cc75
+        sd_login_monitor_unref(systemd_monitor);
b5cc75
+    }
b5cc75
+    systemd_monitor_fd = -1;
b5cc75
+}
b5cc75
+
b5cc75
+static int
b5cc75
+systemdStartDisplay(char *seat)
b5cc75
+{
b5cc75
+    struct display *link = NULL;
b5cc75
+    for (link = displays; link; link = link-> next) {
b5cc75
+        if (link->status == reserve)
b5cc75
+            break;
b5cc75
+    }
b5cc75
+    if (!link) {
b5cc75
+        logError("There's not enough reserve displays for all your seats/sessions");
b5cc75
+        return False;
b5cc75
+    }
b5cc75
+    if (!strDup((&link->systemd_seat), seat)) {
b5cc75
+        return False;
b5cc75
+    }
b5cc75
+#ifdef HAVE_VTS
b5cc75
+    link->serverVT = 0;
b5cc75
+#endif
b5cc75
+    link->status = notRunning;
b5cc75
+    link->stillThere = True;
b5cc75
+    link->authorize = True;
b5cc75
+    link->displayType = dLocal | dPermanent;
b5cc75
+    link->reqSrvVT = -1;
b5cc75
+    link->serverPid = -1;
b5cc75
+    return True;
b5cc75
+}
b5cc75
+
b5cc75
+static void
b5cc75
+systemdCheckAdded(char **seat_names) 
b5cc75
+{
b5cc75
+    char **iter_name;
b5cc75
+    struct display *link;
b5cc75
+    for (iter_name = seat_names; *iter_name; iter_name++) {
b5cc75
+        if (strcmp(*iter_name, "seat0") == 0)
b5cc75
+            continue; /* ignore the main seat */
b5cc75
+        int can_graphical = sd_seat_can_graphical(*iter_name);
b5cc75
+        for (link = displays; link; link = link->next) {
b5cc75
+            if (!link->systemd_seat)
b5cc75
+                continue;
b5cc75
+            /* see if the can_graphical property didn't change */
b5cc75
+            if (strcmp(*iter_name, link->systemd_seat) == 0) {
b5cc75
+                if (!can_graphical) {
b5cc75
+                    free(link->systemd_seat);
b5cc75
+                    link->systemd_seat = NULL;
b5cc75
+                    rStopDisplay(link, DS_RESERVE);
b5cc75
+                }
b5cc75
+                break;
b5cc75
+            }
b5cc75
+        }
b5cc75
+        /* the display wasn't found */
b5cc75
+        if (!link) {
b5cc75
+            if (can_graphical) {
b5cc75
+                /* if starting the display failed, skip this round until the next change */
b5cc75
+                if (!systemdStartDisplay(*iter_name))
b5cc75
+                    break;
b5cc75
+            }
b5cc75
+        }
b5cc75
+    }
b5cc75
+}
b5cc75
+
b5cc75
+static void
b5cc75
+systemdCheckRemoved(char **seat_names)
b5cc75
+{
b5cc75
+    char **iter_name;
b5cc75
+    struct display *link;
b5cc75
+    for (link = displays; link; link = link->next) {
b5cc75
+        for (iter_name = seat_names; *iter_name; iter_name++) {
b5cc75
+            if (strcmp(*iter_name, "seat0") == 0)
b5cc75
+                continue; /* ignore the main seat */
b5cc75
+            if (link->systemd_seat && strcmp(*iter_name, link->systemd_seat) == 0)
b5cc75
+                break;
b5cc75
+        }
b5cc75
+        if (!(*iter_name) && link->systemd_seat) { /* was not found, stop this one */
b5cc75
+            free(link->systemd_seat);
b5cc75
+            link->systemd_seat = NULL;
b5cc75
+            rStopDisplay(link, DS_RESERVE);
b5cc75
+        }
b5cc75
+    }
b5cc75
+}
b5cc75
+
b5cc75
+static void
b5cc75
+systemdHandleChange(void)
b5cc75
+{
b5cc75
+    static int failures = 0;
b5cc75
+    char **seat_names;
b5cc75
+    char **iter_name;
b5cc75
+    int check;
b5cc75
+    if ((check = sd_get_seats(&seat_names)) < 0) {
b5cc75
+        logError("Can't obtain systemd seats, error %d\n", -check);
b5cc75
+        failures++;
b5cc75
+        if (failures >= SYSTEMD_FAILURE_LIMIT) {
b5cc75
+            logError("%u failed calls to sd_get_seats, disabling systemd multi-seat support\n", SYSTEMD_FAILURE_LIMIT);
b5cc75
+            systemdMonitorDeinit();
b5cc75
+        }
b5cc75
+        return;
b5cc75
+    }
b5cc75
+
b5cc75
+    if (!check)
b5cc75
+        return;
b5cc75
+
b5cc75
+    systemdCheckAdded(seat_names);
b5cc75
+    systemdCheckRemoved(seat_names);
b5cc75
+
b5cc75
+    for (iter_name = seat_names; *iter_name; iter_name++)
b5cc75
+        free(*iter_name);
b5cc75
+    free(seat_names);
b5cc75
+}
b5cc75
+#endif
b5cc75
+
b5cc75
 static void
b5cc75
 checkDisplayStatus(struct display *d)
b5cc75
 {
b5cc75
diff -up kde-workspace-4.10.90/kdm/backend/dm.h.kdm_logind kde-workspace-4.10.90/kdm/backend/dm.h
b5cc75
--- kde-workspace-4.10.90/kdm/backend/dm.h.kdm_logind	2013-06-27 16:27:30.184895241 -0500
b5cc75
+++ kde-workspace-4.10.90/kdm/backend/dm.h	2013-06-27 16:27:30.201895054 -0500
b5cc75
@@ -306,6 +306,9 @@ struct display {
b5cc75
     char *greeterAuthFile;      /* file to store authorization for greeter in */
b5cc75
     
b5cc75
     int plymouth_vt;            /* Plymouth's VT nr */
b5cc75
+#ifdef WITH_SYSTEMD
b5cc75
+    char *systemd_seat;
b5cc75
+#endif
b5cc75
 };
b5cc75
 
b5cc75
 #define d_location   1
b5cc75
diff -up kde-workspace-4.10.90/kdm/backend/server.c.kdm_logind kde-workspace-4.10.90/kdm/backend/server.c
b5cc75
--- kde-workspace-4.10.90/kdm/backend/server.c.kdm_logind	2013-06-27 16:27:30.184895241 -0500
b5cc75
+++ kde-workspace-4.10.90/kdm/backend/server.c	2013-06-27 16:27:30.201895054 -0500
b5cc75
@@ -43,6 +43,7 @@ from the copyright holder.
b5cc75
 #include <stdio.h>
b5cc75
 #include <signal.h>
b5cc75
 
b5cc75
+#define SYSTEMD_X_WRAPPER "/lib/systemd/systemd-multi-seat-x"
b5cc75
 
b5cc75
 struct display *startingServer;
b5cc75
 time_t serverTimeout = TO_INF;
b5cc75
@@ -55,9 +56,18 @@ prepareServerArgv(struct display *d, con
b5cc75
     char vtstr[8];
b5cc75
 #endif
b5cc75
 
b5cc75
-    if (!(argv = parseArgs(0, d->serverCmd)) ||
b5cc75
-        !(argv = addStrArr(argv, d->name, -1)))
b5cc75
+#if WITH_SYSTEMD
b5cc75
+    FILE *tmpFile = NULL;
b5cc75
+    if ((tmpFile = fopen(SYSTEMD_X_WRAPPER, "rb")) != NULL && fclose(tmpFile) == 0) {
b5cc75
+        if (!(argv = parseArgs(0, SYSTEMD_X_WRAPPER)) || !(argv = addStrArr(argv, d->name, -1))) {
b5cc75
+            exit(47);
b5cc75
+        }
b5cc75
+    }
b5cc75
+    else
b5cc75
+#endif
b5cc75
+    if (!(argv = parseArgs(0, d->serverCmd)) || !(argv = addStrArr(argv, d->name, -1))) {
b5cc75
         exit(47);
b5cc75
+    }
b5cc75
 #ifdef HAVE_VTS
b5cc75
     if (d->serverVT &&
b5cc75
         !(argv = addStrArr(argv, vtstr,
b5cc75
@@ -70,6 +80,25 @@ prepareServerArgv(struct display *d, con
b5cc75
     if (!changeUser(d->serverUID, d->authFile))
b5cc75
         exit(47);
b5cc75
 
b5cc75
+#ifdef WITH_SYSTEMD
b5cc75
+    if (d->systemd_seat) {
b5cc75
+        if (!(argv = parseArgs(argv, "-seat")))
b5cc75
+            exit(47);
b5cc75
+        if (!(argv = parseArgs(argv, d->systemd_seat)))
b5cc75
+            exit(47);
b5cc75
+        if (!(argv = parseArgs(argv, "-layout")))
b5cc75
+            exit(47);
b5cc75
+        if (!(argv = parseArgs(argv, d->systemd_seat)))
b5cc75
+            exit(47);
b5cc75
+    }
b5cc75
+    else {
b5cc75
+        if (!(argv = parseArgs(argv, "-seat")))
b5cc75
+            exit(47);
b5cc75
+        if (!(argv = parseArgs(argv, "seat0")))
b5cc75
+            exit(47);
b5cc75
+    }
b5cc75
+#endif
b5cc75
+
b5cc75
     return argv;
b5cc75
 }
b5cc75
 
b5cc75
--- kde-workspace-4.10.2/kdm/backend/client.c.kdm_logind
b5cc75
+++ kde-workspace-4.10.2/kdm/backend/client.c
b5cc75
@@ -1460,6 +1460,14 @@ startClient(volatile int *pid)
b5cc75
 #endif
b5cc75
     userEnviron = inheritEnv(env, envvars);
b5cc75
     env = systemEnv(0, curuser);
b5cc75
+#ifdef WITH_SYSTEMD
b5cc75
+    if (td->systemd_seat) {
b5cc75
+        char *envbuf;
b5cc75
+        ASPrintf(&envbuf, "XDG_SEAT=%s", td->systemd_seat);
b5cc75
+        pam_putenv(pamh, envbuf);
b5cc75
+        env = setEnv(env, "XDG_SEAT", td->systemd_seat);
b5cc75
+    }
b5cc75
+#endif
b5cc75
     systemEnviron = setEnv(env, "HOME", p->pw_dir);
b5cc75
     debug("user environment:\n%[|''>'\n's"
b5cc75
           "system environment:\n%[|''>'\n's"
b5cc75
--- kde-workspace-4.10.2/kdm/backend/session.c.kdm_logind
b5cc75
+++ kde-workspace-4.10.2/kdm/backend/session.c
b5cc75
@@ -437,6 +437,10 @@ openGreeter()
b5cc75
 
b5cc75
     grttalk.pipe = &grtproc.pipe;
b5cc75
     env = systemEnv(dupEnv(), 0);
b5cc75
+#ifdef WITH_SYSTEMD
b5cc75
+    if (td->systemd_seat)
b5cc75
+        env = setEnv(env, "XDG_SEAT", td->systemd_seat);
b5cc75
+#endif
b5cc75
     if (gOpen(&grtproc, (char **)0, "_greet", env, name,
b5cc75
               greeterUID, td->greeterAuthFile, &td->gpipe))
b5cc75
         sessionExit(EX_UNMANAGE_DPY);