rpms/libuser/devel libuser-0.56.6-selinux.patch, NONE, 1.1 libuser.spec, 1.71, 1.72

[Miloslav Trmac (mitr)]

Author: mitr

Update of /cvs/pkgs/rpms/libuser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15434

Modified Files:
	libuser.spec 
Added Files:
	libuser-0.56.6-selinux.patch 
Log Message:
Merge from the F-8 branch first...


libuser-0.56.6-selinux.patch:

--- NEW FILE libuser-0.56.6-selinux.patch ---
? build
Index: ChangeLog
===================================================================
RCS file: /usr/local/CVS/libuser/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- ChangeLog	25 Oct 2007 06:36:56 -0000	1.143
+++ ChangeLog	30 Oct 2007 22:23:33 -0000	1.144
@@ -1,3 +1,8 @@
+2007-10-30  Miloslav Trmač  <mitr at redhat.com>
+
+	* lib/util.c (lu_util_fscreate_restore) [WITH_SELINUX]: Fix use of
+	uninitialized data when SELinux is disabled.
+
 2007-10-25  Miloslav Trmač  <mitr at redhat.com>
 
 	* configure.in: Version 0.56.6.
Index: lib/util.c
===================================================================
RCS file: /usr/local/CVS/libuser/lib/util.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lib/util.c	25 Oct 2007 05:48:04 -0000	1.16
+++ lib/util.c	30 Oct 2007 22:23:33 -0000	1.17
@@ -613,10 +613,11 @@
 void
 lu_util_fscreate_restore(security_context_t ctx)
 {
-	/* Don't check is_selinux_enabled(), we ignore errors anyway */
-	(void)setfscreatecon(ctx);
-	if (ctx)
-		freecon(ctx);
+	if (is_selinux_enabled() > 0) {
+		(void)setfscreatecon(ctx);
+		if (ctx)
+			freecon(ctx);
+	}
 }
 
 /* Set fscreate context from context of file. */


Index: libuser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- libuser.spec	3 Dec 2007 23:10:16 -0000	1.71
+++ libuser.spec	3 Dec 2007 23:13:15 -0000	1.72
@@ -5,10 +5,11 @@
 
 Name: libuser
 Version: 0.56.6
-Release: 2
+Release: 3
 Group: System Environment/Base
 License: LGPLv2+
 Source: libuser-%{version}.tar.bz2
+Patch0: libuser-0.56.6-selinux.patch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt-devel, python-devel
 BuildRequires: cyrus-sasl-devel, openldap-devel
@@ -48,6 +49,8 @@
 %prep
 %setup -q
 
+%patch0 -p0 -b .selinux
+
 %build
 %configure \
 %if %{WITH_SELINUX}
@@ -108,8 +111,11 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Tue Dec  4 2007 Miloslav Trmač <mitr at redhat.com> - 0.56.6-2
-- Rebuild for openldap-2.4.
+* Tue Dec  4 2007 Miloslav Trmač <mitr at redhat.com> - 0.56.6-3
+- Rebuild with openldap-2.4.
+
+* Wed Oct 31 2007 Miloslav Trmač <mitr at redhat.com> - 0.56.6-2
+- Fix uninitialized memory usage when SELinux is disabled
 
 * Thu Oct 25 2007 Miloslav Trmač <mitr at redhat.com> - 0.56.6-1
 - Set SELinux file contexts when creating home directories, preserve them when