Accepting request 459758 from GNOME:Next
Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/459758 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=97
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
diff -urp accountsservice-0.6.40.orig/src/daemon.c accountsservice-0.6.40/src/daemon.c
|
||||
--- accountsservice-0.6.40.orig/src/daemon.c 2014-11-03 21:46:00.000000000 -0600
|
||||
+++ accountsservice-0.6.40/src/daemon.c 2016-04-14 14:35:00.644563940 -0500
|
||||
@@ -234,7 +234,8 @@ entry_generator_cachedir (GHashTable *us
|
||||
Index: accountsservice-0.6.43/src/daemon.c
|
||||
===================================================================
|
||||
--- accountsservice-0.6.43.orig/src/daemon.c
|
||||
+++ accountsservice-0.6.43/src/daemon.c
|
||||
@@ -309,7 +309,8 @@ entry_generator_cachedir (GHashTable *
|
||||
static void
|
||||
load_entries (Daemon *daemon,
|
||||
GHashTable *users,
|
||||
@@ -11,16 +12,16 @@ diff -urp accountsservice-0.6.40.orig/src/daemon.c accountsservice-0.6.40/src/da
|
||||
{
|
||||
gpointer generator_state = NULL;
|
||||
struct passwd *pwent;
|
||||
@@ -248,7 +249,7 @@ load_entries (Daemon *daemon
|
||||
@@ -325,7 +326,7 @@ load_entries (Daemon *daemon
|
||||
break;
|
||||
|
||||
/* Skip system users... */
|
||||
- if (!user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, NULL)) {
|
||||
+ if (!force_load && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, NULL)) {
|
||||
- if (!user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) {
|
||||
+ if (!force_load && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) {
|
||||
g_debug ("skipping user: %s", pwent->pw_name);
|
||||
continue;
|
||||
}
|
||||
@@ -306,15 +307,15 @@ reload_users (Daemon *daemon)
|
||||
@@ -383,14 +384,14 @@ reload_users (Daemon *daemon)
|
||||
*/
|
||||
|
||||
/* Load the local users into our hash table */
|
||||
@@ -32,10 +33,8 @@ diff -urp accountsservice-0.6.40.orig/src/daemon.c accountsservice-0.6.40/src/da
|
||||
g_hash_table_add (local, name);
|
||||
|
||||
/* Now add/update users from other sources, possibly non-local */
|
||||
- load_entries (daemon, users, wtmp_helper_entry_generator);
|
||||
- load_entries (daemon, users, entry_generator_cachedir);
|
||||
+ load_entries (daemon, users, wtmp_helper_entry_generator, FALSE);
|
||||
+ load_entries (daemon, users, entry_generator_cachedir, TRUE);
|
||||
|
||||
/* Mark which users are local, which are not */
|
||||
g_hash_table_iter_init (&iter, users);
|
||||
wtmp_helper_update_login_frequencies (users);
|
||||
|
||||
|
@@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 30 15:42:14 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Rebase accountsservice-933083-load-root-setting.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 24 20:41:41 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
|
@@ -56,8 +56,8 @@ commands.
|
||||
|
||||
%package -n libaccountsservice0
|
||||
Summary: D-Bus Service to Manipulate User Account Information -- Client Library
|
||||
Group: System/Libraries
|
||||
# Clients do need the server to do something useful
|
||||
Group: System/Libraries
|
||||
Requires: %{name}
|
||||
|
||||
%description -n libaccountsservice0
|
||||
|
Reference in New Issue
Block a user