Accepting request 115067 from home:vuntz:branches:GNOME:Factory

bnc#757662

OBS-URL: https://build.opensuse.org/request/show/115067
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=31

accountsservice-filter-more-accounts.patch

@@ -0,0 +1,24 @@
+From 9bbea12e0592530349c0b07669430186cfeed5a1 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Wed, 18 Apr 2012 08:55:50 +0200
+Subject: [PATCH] daemon: Also exclude "at" user
+
+---
+ src/daemon.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index d186ab6..0103632 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -79,6 +79,7 @@ static const char *default_excludes[] = {
+         "ftp",
+         "games",
+         "man",
++        "at",
+         NULL
+ };
+ 
+-- 
+1.7.9.2
+

accountsservice-filter-no-shell.patch

@@ -0,0 +1,32 @@
+From dc95009e692071f56a194b6b1466c9a2b284feee Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Wed, 18 Apr 2012 08:57:11 +0200
+Subject: [PATCH] daemon: Exclude users with no shell
+
+The NIS entry in /etc/passwd seems to be:
++::::::
+
+We obviously don't want a user with no shell to be visible, so use this
+more generic solution.
+---
+ src/daemon.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index d186ab6..be98de7 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -163,8 +163,8 @@ daemon_local_user_is_excluded (Daemon *daemon, const gchar *username, const gcha
+         char *basename, *nologin_basename, *false_basename;
+         int ret;
+ 
+-        if (shell == NULL) {
+-                return FALSE;
++        if (shell == NULL || shell[0] == '\0') {
++                return TRUE;
+         }
+ 
+         ret = FALSE;
+-- 
+1.7.9.2
+

accountsservice-filter-suse-accounts.patch

@@ -3,9 +3,9 @@ Index: accountsservice-0.6.17/src/daemon.c
 --- accountsservice-0.6.17.orig/src/daemon.c
 +++ accountsservice-0.6.17/src/daemon.c
 @@ -79,6 +79,8 @@ static const char *default_excludes[] =
-         "ftp",
          "games",
          "man",
+         "at",
 +        "beagleindex",
 +        "suse-ncc",
          NULL

accountsservice.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr 23 07:57:30 UTC 2012 - vuntz@opensuse.org
+
+- Add back accountsservice-filter-more-accounts.patch to filter the
+  at user.
+- Add accountsservice-filter-no-shell.patch to filter users with no
+  shell, which happens when NIS is setup.
+- This should fix bnc#757662.
+- Rebase accountsservice-filter-suse-accounts.patch.
+
 -------------------------------------------------------------------
 Sat Apr 14 16:29:42 UTC 2012 - dimstar@opensuse.org
 

accountsservice.spec

@@ -27,8 +27,12 @@ Source:         http://www.freedesktop.org/software/accountsservice/%{name}-%{ve
 # WARNING: do not remove/significantly change patch0 without updating the relevant patch in gdm too
 # PATCH-FIX-OPENSUSE accountsservice-sysconfig.patch bnc#688071 vuntz@opensuse.org -- Read/write autologin configuration from sysconfig, like gdm (see gdm-sysconfig-settings.patch)
 Patch0:         accountsservice-sysconfig.patch
+# PATCH-FIX-UPSTREAM accountsservice-filter-more-accounts.patch fdo#48178 vuntz@opensuse.org -- Filter out more system users (at)
+Patch1:         accountsservice-filter-more-accounts.patch
+# PATCH-FIX-UPSTREAM accountsservice-filter-no-shell.patch fdo#48859 vuntz@opensuse.org -- Filter out users with no shell (which happens when NIS is setup)
+Patch2:         accountsservice-filter-no-shell.patch
 # PATCH-FIX-OPENSUSE accountsservice-filter-suse-accounts.patch vuntz@opensuse.org -- Filter out some system users that are specific to openSUSE
-Patch2:         accountsservice-filter-suse-accounts.patch
+Patch3:         accountsservice-filter-suse-accounts.patch
 # needed for patch0
 BuildRequires:  gnome-common
 BuildRequires:  gobject-introspection-devel
@@ -88,7 +92,9 @@ querying and manipulating user account information.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # needed for patch0