Merge commit '907d6b5138a7660cad96649160f84f29bd3430fe'

Conflicts:
	accountsservice.spec

.gitignore

@@ -4,3 +4,4 @@
 /accountsservice-0.6.11.tar.bz2
 /accountsservice-0.6.12.tar.bz2
 /accountsservice-0.6.13.tar.xz
+/accountsservice-0.6.14.tar.xz

accountsservice.spec

@@ -1,7 +1,7 @@
 
 Name:           accountsservice
-Version:        0.6.13
-Release:        3%{?dist}
+Version:        0.6.14
+Release:        2%{?dist}
 Summary:        D-Bus interfaces for querying and manipulating user account information
 
 Group:          System Environment/Daemons
@@ -10,9 +10,6 @@ URL:            http://www.fedoraproject.org/wiki/Features/UserAccountDialog
 #VCS: git:git://git.freedesktop.org/accountsservice
 Source0:        http://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz
 
-# upstream fix
-Patch0:         0001-Fix-fast-user-switching.patch
-
 BuildRequires:  glib2-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  polkit-devel
@@ -23,6 +20,8 @@ BuildRequires:  gobject-introspection-devel
 Requires:       polkit
 Requires:       shadow-utils
 
+Patch0: fix-wtmp-loading.patch
+
 %package libs
 Summary: Client-side library to talk to accountservice
 Group: Development/Libraries
@@ -52,7 +51,7 @@ of these interfaces, based on the useradd, usermod and userdel commands.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .fix-wtmp-loading
 
 %build
 %configure
@@ -91,6 +90,13 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a
 %{_datadir}/gir-1.0/AccountsService-1.0.gir
 
 %changelog
+* Wed Sep 21 2011 Ray Strode <rstrode@redhat.com> 0.6.14-2
+- Fix wtmp loading so users coming from the network are
+  remembered in the user list in subsequent boots
+
+* Wed Sep 21 2011 Ray Strode <rstrode@redhat.com> 0.6.14-1
+- Update to 0.6.14
+
 * Sun Sep  4 2011 Matthias Clasen <mclasen@redhat.com> - 0.6.13-3
 - Fix fast user switching
 

fix-wtmp-loading.patch

@@ -0,0 +1,29 @@
+From b73f539602f74271650a102d90253dc697488478 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 21 Sep 2011 17:20:24 -0400
+Subject: [PATCH] daemon: load wtmp after passwd file
+
+The passwd file handling code clears the list of loaded
+users so we need to always do wtmp on top of it, instead of
+before it.
+---
+ src/daemon.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index 79915a7..99ee161 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -427,8 +427,8 @@ reload_data (Daemon *daemon)
+ static void
+ reload_users (Daemon *daemon)
+ {
+-        reload_wtmp_history (daemon);
+         reload_passwd (daemon);
++        reload_wtmp_history (daemon);
+         reload_data (daemon);
+ }
+ 
+-- 
+1.7.6.2
+

sources

@@ -1 +1 @@
-d09b8b3008ffda235069e8b412c5dd54  accountsservice-0.6.13.tar.xz
+3422ff158ee2834344c534516e5e8a9d  accountsservice-0.6.14.tar.xz