]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
login: fix FDNAME in call to sd_pid_notify_with_fds()
authorAlan Jenkins <alan.christopher.jenkins@gmail.com>
Sat, 3 Mar 2018 18:37:50 +0000 (18:37 +0000)
committerAlan Jenkins <alan.christopher.jenkins@gmail.com>
Sat, 3 Mar 2018 20:50:18 +0000 (20:50 +0000)
$ git grep FDNAME
logind-session-device.c: ... "FDNAME=session-", sd->session->id);
logind-session-device.c: ... "FDNAME=session", sd->session->id);

Oops.

Fixes #8343.  Or at least a more minimal reproducer.  Xorg still
dies when logind is restarted, but the Xorg message says this
is entirely deliberate.

(This could also be the reason I hit #8035, instead of the race
condition I originally suggested).

src/login/logind-session-device.c

index c64fb4359b9ae1a14b3ba662626c9919291c5d99..7253f95981424e3d9df7def043a4340aa2d625c0 100644 (file)
@@ -526,7 +526,7 @@ int session_device_save(SessionDevice *sd) {
                 return 0;
 
         m = strjoina("FDSTORE=1\n"
-                     "FDNAME=session", sd->session->id);
+                     "FDNAME=session-", sd->session->id);
 
         r = sd_pid_notify_with_fds(0, false, m, &sd->fd, 1);
         if (r < 0)