Attachment 76858 Details for Bug 62585 – Fix test for logind availability

[patch] Fix test for logind availability

0001-Fix-test-for-logind-availability.patch (text/plain), 1.23 KB, created by Martin Pitt on 2013-03-21 08:46:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Pitt

Created: 2013-03-21 08:46:51 UTC

Size: 1.23 KB

patch

obsolete

>From d7dd3733afc704df58b6e1ce4b177becec652af6 Mon Sep 17 00:00:00 2001
>From: Martin Pitt <martinpitt@gnome.org>
>Date: Thu, 21 Mar 2013 09:24:21 +0100
>Subject: [PATCH 1/3] Fix test for logind availability
>
>sd_booted() is not an appropriate check for whether we should talk to logind,
>test for /run/systemd/seats/ instead.
>
>For details, see:
><https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00092.html>
>
>https://bugs.freedesktop.org/show_bug.cgi?id=62585
>---
> dbus/dbus-userdb-util.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
>index 16bf229..2430634 100644
>--- a/dbus/dbus-userdb-util.c
>+++ b/dbus/dbus-userdb-util.c
>@@ -21,6 +21,7 @@
>  *
>  */
> #include <config.h>
>+#include <unistd.h>
> #define DBUS_USERDB_INCLUDES_PRIVATE 1
> #include "dbus-userdb.h"
> #include "dbus-test.h"
>@@ -29,7 +30,6 @@
> #include <string.h>
> 
> #if HAVE_SYSTEMD
>-#include <systemd/sd-daemon.h>
> #include <systemd/sd-login.h>
> #endif
> 
>@@ -55,7 +55,8 @@ _dbus_is_console_user (dbus_uid_t uid,
>   dbus_bool_t result = FALSE;
> 
> #ifdef HAVE_SYSTEMD
>-  if (sd_booted () > 0)
>+  /* check if we have logind */
>+  if (access("/run/systemd/seats/", F_OK) >= 0)
>     {
>       int r;
> 
>-- 
>1.8.1.2
>

Actions: View | Splinter Review

Attachments on bug 62585: 76858 | 76859

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.