rpms/shadow-utils/devel shadow-4.1.1-selinuxUserMappings.patch, NONE, 1.1 shadow-utils.spec, 1.121, 1.122

Peter Vrabec pvrabec at fedoraproject.org
Thu Sep 11 11:48:10 UTC 2008


Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24115

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.1.1-selinuxUserMappings.patch 
Log Message:
fix usermod SELinux user mappings change (#458766)


shadow-4.1.1-selinuxUserMappings.patch:

--- NEW FILE shadow-4.1.1-selinuxUserMappings.patch ---
diff -up shadow-4.1.1/src/usermod.c.selinux-user shadow-4.1.1/src/usermod.c
--- shadow-4.1.1/src/usermod.c.selinux-user	2008-09-09 17:28:45.673915250 +0200
+++ shadow-4.1.1/src/usermod.c	2008-09-09 17:35:39.000000000 +0200
@@ -116,6 +116,7 @@ static int
     oflg = 0,			/* permit non-unique user ID to be specified with -u */
     pflg = 0,			/* new encrypted password */
     sflg = 0,			/* new shell program */
+    Sflg = 0,			/* new selinux user */
     uflg = 0,			/* specify new user ID */
     Uflg = 0;			/* unlock the password */
 
@@ -967,8 +968,10 @@ static void process_flags (int argc, cha
 				break;
 #ifdef WITH_SELINUX
                          case 'Z':
-                                if (is_selinux_enabled() > 0)
-                                        user_selinux = optarg;
+                                if (is_selinux_enabled() > 0) {
+					user_selinux = optarg;
+					Sflg++;
+				}
                                 else {
                                         fprintf (stderr, _("%s: -Z requires SELinux enabled kernel\n"), Prog);
                                         exit (E_BAD_ARG);
@@ -1015,7 +1018,7 @@ static void process_flags (int argc, cha
 	}
 
 	if (Uflg + uflg + sflg + pflg + oflg + mflg + Lflg + lflg + Gflg +
-	    gflg + fflg + eflg + dflg + cflg == 0) {
+	    gflg + fflg + eflg + dflg + cflg + Sflg == 0) {
 		fprintf (stderr, _("%s: no changes\n"), Prog);
 		exit (E_SUCCESS);
 	}


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- shadow-utils.spec	2 Sep 2008 14:12:30 -0000	1.121
+++ shadow-utils.spec	11 Sep 2008 11:47:39 -0000	1.122
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -18,6 +18,7 @@
 Patch3: shadow-4.1.2-sysAccountDownhill.patch
 Patch4: shadow-4.1.2-gmSEGV.patch
 Patch5: shadow-4.1.2-audit.patch
+Patch6: shadow-4.1.1-selinuxUserMappings.patch
 
 License: BSD
 Group: System Environment/Base
@@ -48,6 +49,7 @@
 %patch3 -p1 -b .sysAccountDownhill
 %patch4 -p1 -b .gmSEGV
 %patch5 -p1 -b .audit
+%patch6 -p1 -b .selinuxUserMappings
 
 
 rm po/*.gmo
@@ -188,10 +190,13 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
-* Thu Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-6
+* Thu Sep 11 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-7
+- fix usermod SELinux user mappings change (#458766)
+
+* Tue Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-6
 - audit improvements, thnx. to sgrubb at redhat.com
 
-* Thu Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-5
+* Tue Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-5
 - fix groupmems issues (#459825)
 
 * Mon Jul 28 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-4




More information about the fedora-extras-commits mailing list