12
0

Accepting request 701432 from home:xiaoguang_wang:branches:GNOME:Factory

- Update accountsservice-read-root-user-cache.patch
  + upstream commit d8b77951

OBS-URL: https://build.opensuse.org/request/show/701432
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=130
This commit is contained in:
2019-05-08 15:32:00 +00:00
committed by Git OBS Bridge
parent 8682adb6c9
commit c2cb5715e8
2 changed files with 37 additions and 22 deletions

View File

@@ -1,24 +1,33 @@
Index: accountsservice-0.6.54/src/daemon.c
===================================================================
--- accountsservice-0.6.54.orig/src/daemon.c
+++ accountsservice-0.6.54/src/daemon.c
@@ -829,9 +829,19 @@ add_new_user_for_pwent (Daemon *d
{
DaemonPrivate *priv = daemon_get_instance_private (daemon);
User *user;
+ g_autofree gchar *filename = NULL;
+ g_autoptr(GKeyFile) key_file = NULL;
+ const gchar *user_name;
From d8b779513474ece1f5ec2fc9b7c32afb73e32181 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 29 Apr 2019 10:14:12 -0400
Subject: [PATCH] daemon: ensure cache files for system users are processed
At the moment we skip cache files for system users. That
doesn't make much sense; if there's a cache file we should
be using it.
This commit changes the code to read cache files, even for
system users, and so lets root have a non-default session.
Closes: https://gitlab.freedesktop.org/accountsservice/accountsservice/issues/65
---
src/daemon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/daemon.c b/src/daemon.c
index c52bda3..d7c4437 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -485,7 +485,7 @@ reload_users (Daemon *daemon)
load_entries (daemon, users, TRUE, entry_generator_requested_users);
user = user_new (daemon, pwent->pw_uid);
user_update_from_pwent (user, pwent, spent);
+
+ user_name = user_get_user_name (user);
+ filename = g_build_filename (USERDIR, user_name, NULL);
+ key_file = g_key_file_new ();
+ if (g_key_file_load_from_file (key_file, filename, 0, NULL))
+ user_update_from_keyfile (user, key_file);
+
user_register (user);
/* Now add/update users from other sources, possibly non-local */
- load_entries (daemon, users, FALSE, entry_generator_cachedir);
+ load_entries (daemon, users, TRUE, entry_generator_cachedir);
g_hash_table_insert (priv->users,
wtmp_helper_update_login_frequencies (users);
--
2.16.4

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 8 01:25:32 UTC 2019 - xwang@suse.com
- Update accountsservice-read-root-user-cache.patch
+ upstream commit d8b77951
-------------------------------------------------------------------
Wed Apr 3 02:54:51 UTC 2019 - xwang@suse.com