rpms/sysvinit/devel sysvinit-2.87-sulogin.patch, NONE, 1.1 sysvinit.spec, 1.77, 1.78

[Petr Lautrbach]

Author: plautrba

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

Modified Files:
	sysvinit.spec 
Added Files:
	sysvinit-2.87-sulogin.patch 
Log Message:
fix using get_default_context_with_level (#568530)


sysvinit-2.87-sulogin.patch:
 sulogin.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sysvinit-2.87-sulogin.patch ---
diff -up sysvinit-2.87dsf/src/sulogin.c~ sysvinit-2.87dsf/src/sulogin.c
--- sysvinit-2.87dsf/src/sulogin.c~	2009-07-12 11:07:45.000000000 -0400
+++ sysvinit-2.87dsf/src/sulogin.c	2010-02-25 17:13:07.000000000 -0500
@@ -348,7 +348,7 @@ void sushell(struct passwd *pwd)
 	  char *seuser=NULL;
 	  char *level=NULL;
 	  if (getseuserbyname("root", &seuser, &level) == 0)
-		  if (get_default_context_with_level(seuser, level, 0, &scon) > 0) {
+		  if (get_default_context_with_level(seuser, level, 0, &scon) == 0) {
 			  if (setexeccon(scon) != 0) 
 				  fprintf(stderr, "setexeccon faile\n");
 			  freecon(scon);


Index: sysvinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysvinit/devel/sysvinit.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sysvinit.spec	17 Sep 2009 17:08:14 -0000	1.77
+++ sysvinit.spec	8 Mar 2010 16:30:50 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: sysvinit
 Version: 2.87
-Release: 1.dsf%{?dist}
+Release: 2.dsf%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://alioth.debian.org/frs/download.php/3060/sysvinit-%{version}dsf.tar.gz
@@ -14,6 +14,7 @@ Patch5: sysvinit-2.86-single.patch
 Patch6: sysvinit-2.86-quiet.patch
 Patch10: sysvinit-2.87-pidof.patch
 Patch11: sysvinit-2.86-pidof-man.patch
+Patch12: sysvinit-2.87-sulogin.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pam >= 0.66-5
 Requires: filesystem >= 2.2.4-1
@@ -58,6 +59,9 @@ management.
 %patch10 -p1 -b .pidof
 # Document some of the behavior of pidof. (#201317)
 %patch11 -p1 -b .pidof
+# get_default_context_with_level returns 0 on success (#568530)
+%patch12 -p1 -b .sulogin
+
 
 %build
 make %{?_smp_mflags} CC="%{__cc}" CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" LDFLAGS="" LCRYPT="-lcrypt" -C src
@@ -130,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sulogin*
 
 %changelog
+* Mon Mar 08 2010 Petr Lautrbach <plautrba at redhat.com> 2.87-2.dsf
+- fix using get_default_context_with_level (#568530)
+
 * Thu Sep 17 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.87-1.dsf
 - Avoid stripping binaries during build to fix -debuginfo.