.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=765

0001-login-simplify-controller-handling.patch

@@ -0,0 +1,118 @@
+Based on b12e56156e5f363ebb8dc4ea5c10f5fd0665dc9d Mon Sep 17 00:00:00 2001
+From: David Herrmann <dh.herrmann@gmail.com>
+Date: Mon, 1 Sep 2014 14:04:44 +0200
+Subject: [PATCH] login: simplify controller handling
+
+Simplify the way we handler session-controllers and fix several
+shortcomings:
+ * send ReleaseDevice() signals on forced session takeover
+ * fix mem-leaks for busnames in case VT preparation fails (non-critical)
+ * avoid passing pre-allocated names to helpers
+---
+ src/login/logind-session.c |   55 ++++++++++++++++++++++----------------------
+ 1 file changed, 28 insertions(+), 27 deletions(-)
+
+diff --git src/login/logind-session.c src/login/logind-session.c
+index 58453b5..10a43a4 100644
+--- src/login/logind-session.c
++++ src/login/logind-session.c
+@@ -1059,32 +1059,30 @@ bool session_is_controller(Session *s, const char *sender) {
+         return streq_ptr(s->controller, sender);
+ }
+ 
+-static void session_swap_controller(Session *s, char *name) {
++static void session_release_controller(Session *s, bool notify) {
++        _cleanup_free_ char *name = NULL;
+         SessionDevice *sd;
+-        char *c;
+ 
+-        if (s->controller) {
+-                c = s->controller;
+-                s->controller = NULL;
+-                manager_drop_busname(s->manager, c);
+-                free(c);
++        if (!s->controller)
++                return;
+ 
+-                /* Drop all devices as they're now unused. Do that after the
+-                 * controller is released to avoid sending out useles
+-                 * dbus signals. */
+-                while ((sd = hashmap_first(s->devices)))
+-                        session_device_free(sd);
++        name = s->controller;
+ 
+-                if (!name)
+-                        session_restore_vt(s);
+-        }
++        /* By resetting the controller before releasing the devices, we won't
++         * send notification signals. This avoids sending useless notifications
++         * if the controller is released on disconnects. */
++        if (!notify)
++                s->controller = NULL;
+ 
+-        s->controller = name;
+-        session_save(s);
++        while ((sd = hashmap_first(s->devices)))
++                session_device_free(sd);
++
++        s->controller = NULL;
++        manager_drop_busname(s->manager, name);
+ }
+ 
+ int session_set_controller(Session *s, const char *sender, bool force) {
+-        char *t;
++        _cleanup_free_ char *name = NULL;
+         int r;
+ 
+         assert(s);
+@@ -1095,15 +1093,13 @@ int session_set_controller(Session *s, const char *sender, bool force) {
+         if (s->controller && !force)
+                 return -EBUSY;
+ 
+-        t = strdup(sender);
+-        if (!t)
++        name = strdup(sender);
++        if (!name)
+                 return -ENOMEM;
+ 
+-        r = manager_watch_busname(s->manager, sender);
+-        if (r) {
+-                free(t);
++        r = manager_watch_busname(s->manager, name);
++        if (r)
+                 return r;
+-        }
+ 
+         /* When setting a session controller, we forcibly mute the VT and set
+          * it into graphics-mode. Applications can override that by changing
+@@ -1115,11 +1111,14 @@ int session_set_controller(Session *s, const char *sender, bool force) {
+          * or reset the VT in case it crashed/exited, too. */
+         r = session_mute_vt(s);
+         if (r < 0) {
+-                free(t);
++                manager_drop_busname(s->manager, name);
+                 return r;
+         }
+ 
+-        session_swap_controller(s, t);
++        session_release_controller(s, true);
++        s->controller = name;
++        name = NULL;
++        session_save(s);
+ 
+         return 0;
+ }
+@@ -1130,7 +1129,9 @@ void session_drop_controller(Session *s) {
+         if (!s->controller)
+                 return;
+ 
+-        session_swap_controller(s, NULL);
++        session_release_controller(s, false);
++        session_save(s);
++        session_restore_vt(s);
+ }
+ 
+ static const char* const session_state_table[_SESSION_STATE_MAX] = {
+-- 
+1.7.9.2
+

systemd-mini.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep  2 09:14:03 UTC 2014 - werner@suse.de
+
+- Add upstream patch
+  0001-login-simplify-controller-handling.patch 
+
 -------------------------------------------------------------------
 Mon Sep  1 13:00:29 UTC 2014 - werner@suse.de
 

systemd-mini.spec

@@ -826,6 +826,8 @@ Patch397:       0003-Quote-unit-names-in-suggested-systemctl-commandlines.patch
 Patch398:       0004-config-parser-fix-mem-leak.patch
 # PATCH-FIX-UPSTREAM added at 2014/09/01
 Patch399:       0005-login-fix-mem-leak.patch
+# PATCH-FIX-UPSTREAM added at 2014/09/02
+Patch400:       0001-login-simplify-controller-handling.patch
 
 # UDEV PATCHES
 # ============
@@ -1521,6 +1523,7 @@ cp %{SOURCE7} m4/
 %patch397 -p0
 %patch398 -p0
 %patch399 -p0
+%patch400 -p0
 
 # udev patches
 %patch1001 -p1

systemd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep  2 09:14:03 UTC 2014 - werner@suse.de
+
+- Add upstream patch
+  0001-login-simplify-controller-handling.patch 
+
 -------------------------------------------------------------------
 Mon Sep  1 13:00:29 UTC 2014 - werner@suse.de
 

systemd.spec

@@ -821,6 +821,8 @@ Patch397:       0003-Quote-unit-names-in-suggested-systemctl-commandlines.patch
 Patch398:       0004-config-parser-fix-mem-leak.patch
 # PATCH-FIX-UPSTREAM added at 2014/09/01
 Patch399:       0005-login-fix-mem-leak.patch
+# PATCH-FIX-UPSTREAM added at 2014/09/02
+Patch400:       0001-login-simplify-controller-handling.patch
 
 # UDEV PATCHES
 # ============
@@ -1516,6 +1518,7 @@ cp %{SOURCE7} m4/
 %patch397 -p0
 %patch398 -p0
 %patch399 -p0
+%patch400 -p0
 
 # udev patches
 %patch1001 -p1