rpms/fprintd/devel 0001-More-cleanups.patch, NONE, 1.1 fprintd.spec, 1.2, 1.3

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/fprintd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14250

Modified Files:
	fprintd.spec 
Added Files:
	0001-More-cleanups.patch 
Log Message:
* Wed Dec 17 2008 - Bastien Nocera <bnocera at redhat.com> - 0.1-5.git43fe72a2aa
- Add patch to stop leaking a D-Bus connection on failure


0001-More-cleanups.patch:

--- NEW FILE 0001-More-cleanups.patch ---
>From 27e794d79d42c0a56808e3252b4f869effc8fa7d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 17 Dec 2008 14:34:25 +0000
Subject: [PATCH] More cleanups

Some objects were leaked when no devices were available. Plug those
leaks.
---
 pam/pam_fprintd.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c
index f24e3a0..133c33e 100644
--- a/pam/pam_fprintd.c
+++ b/pam/pam_fprintd.c
@@ -370,12 +370,17 @@ static int do_auth(pam_handle_t *pamh, const char *username)
 
 	dev = open_device(pamh, connection, manager, username);
 	g_object_unref (manager);
-	if (!dev)
+	if (!dev) {
+		g_main_loop_unref (loop);
+		dbus_g_connection_unref (connection);
 		return PAM_AUTHINFO_UNAVAIL;
+	}
 	ret = do_verify(loop, pamh, dev);
+
 	g_main_loop_unref (loop);
 	release_device(pamh, dev);
 	g_object_unref (dev);
+	dbus_g_connection_unref (connection);
 
 	return ret;
 }
-- 
1.6.0.5



Index: fprintd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/devel/fprintd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fprintd.spec	9 Dec 2008 14:21:37 -0000	1.2
+++ fprintd.spec	17 Dec 2008 14:37:41 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		fprintd
 Version:	0.1
-Release:	4.git%{short_hash}%{?dist}
+Release:	5.git%{short_hash}%{?dist}
 Summary:	D-Bus service for Fingerprint reader access
 
 Group:		System Environment/Daemons
@@ -17,6 +17,7 @@
 # FIXME remove when we have a newer libfprint
 Patch0:		old-libfprint.patch
 Patch1:		0001-Update-D-Bus-config-file.patch
+Patch2:		0001-More-cleanups.patch
 Url:		http://www.reactivated.net/fprint/wiki/Fprintd
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +61,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --libdir=/%{_lib}/ --enable-gtk-doc --enable-pam
@@ -94,6 +96,9 @@
 %{_datadir}/gtk-doc/html/fprintd
 
 %changelog
+* Wed Dec 17 2008 - Bastien Nocera <bnocera at redhat.com> - 0.1-5.git43fe72a2aa
+- Add patch to stop leaking a D-Bus connection on failure
+
 * Tue Dec 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.1-4.git43fe72a2aa
 - Update D-Bus config file for recent D-Bus changes