From d7312d9572c396b6e40e7c3bdd30466e6b88143b Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Tue, 2 Aug 2011 14:20:21 +0200 Subject: [PATCH] fixing semanage issue (#701355) --- shadow-4.1.4.2-semange.patch | 29 +++++++++++------------------ shadow-utils.spec | 5 ++++- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/shadow-4.1.4.2-semange.patch b/shadow-4.1.4.2-semange.patch index fcd30d1..70e1685 100644 --- a/shadow-4.1.4.2-semange.patch +++ b/shadow-4.1.4.2-semange.patch @@ -1,6 +1,6 @@ diff -up shadow-4.1.4.2/man/useradd.8.semange shadow-4.1.4.2/man/useradd.8 ---- shadow-4.1.4.2/man/useradd.8.semange 2011-06-28 15:08:46.583254750 +0200 -+++ shadow-4.1.4.2/man/useradd.8 2011-06-28 15:08:46.600282568 +0200 +--- shadow-4.1.4.2/man/useradd.8.semange 2011-08-02 13:54:12.337225945 +0200 ++++ shadow-4.1.4.2/man/useradd.8 2011-08-02 13:54:12.352225894 +0200 @@ -631,6 +631,11 @@ can\'t create home directory .RS 4 can\'t create mail spool @@ -15,7 +15,7 @@ diff -up shadow-4.1.4.2/man/useradd.8.semange shadow-4.1.4.2/man/useradd.8 diff -up shadow-4.1.4.2/man/userdel.8.semange shadow-4.1.4.2/man/userdel.8 --- shadow-4.1.4.2/man/userdel.8.semange 2009-07-24 03:16:45.000000000 +0200 -+++ shadow-4.1.4.2/man/userdel.8 2011-06-28 15:08:46.601278956 +0200 ++++ shadow-4.1.4.2/man/userdel.8 2011-08-02 13:55:45.232913101 +0200 @@ -67,6 +67,11 @@ variable in the login\&.defs file\&. @@ -23,14 +23,14 @@ diff -up shadow-4.1.4.2/man/userdel.8.semange shadow-4.1.4.2/man/userdel.8 +.PP +\fB\-Z\fR, \fB\-\-selinux-user\fR +.RS 4 -+Remove SELinux user assigned to the user´s login from SELinux login mapping. Use with caution, all the occurrences of the SELinux user will be removed. ++Remove SELinux user assigned to the user´s login from SELinux login mapping\&. +.RE .SH "CONFIGURATION" .PP The following configuration variables in diff -up shadow-4.1.4.2/src/useradd.c.semange shadow-4.1.4.2/src/useradd.c ---- shadow-4.1.4.2/src/useradd.c.semange 2011-06-28 15:08:46.577257401 +0200 -+++ shadow-4.1.4.2/src/useradd.c 2011-06-28 15:54:22.430084199 +0200 +--- shadow-4.1.4.2/src/useradd.c.semange 2011-08-02 13:54:12.333225959 +0200 ++++ shadow-4.1.4.2/src/useradd.c 2011-08-02 13:54:12.353225890 +0200 @@ -164,6 +164,7 @@ static bool home_added = false; #define E_GRP_UPDATE 10 /* can't update group file */ #define E_HOMEDIR 12 /* can't create home directory */ @@ -82,12 +82,9 @@ diff -up shadow-4.1.4.2/src/useradd.c.semange shadow-4.1.4.2/src/useradd.c /* * create_home - create the user's home directory * -@@ -2022,12 +1994,35 @@ int main (int argc, char **argv) - create_mail (); - } +@@ -2025,7 +1997,30 @@ int main (int argc, char **argv) + close_files (); -- close_files (); -- #ifdef WITH_SELINUX - selinux_update_mapping (); + if (Zflg && *user_selinux) { @@ -116,14 +113,10 @@ diff -up shadow-4.1.4.2/src/useradd.c.semange shadow-4.1.4.2/src/useradd.c + } #endif -+ close_files (); -+ nscd_flush_cache ("passwd"); - nscd_flush_cache ("group"); - diff -up shadow-4.1.4.2/src/userdel.c.semange shadow-4.1.4.2/src/userdel.c --- shadow-4.1.4.2/src/userdel.c.semange 2009-05-22 12:41:12.000000000 +0200 -+++ shadow-4.1.4.2/src/userdel.c 2011-06-28 15:08:46.604254774 +0200 ++++ shadow-4.1.4.2/src/userdel.c 2011-08-02 13:54:12.354225887 +0200 @@ -82,6 +82,7 @@ static char *user_home; static bool fflg = false; @@ -207,8 +200,8 @@ diff -up shadow-4.1.4.2/src/userdel.c.semange shadow-4.1.4.2/src/userdel.c #endif diff -up shadow-4.1.4.2/src/usermod.c.semange shadow-4.1.4.2/src/usermod.c ---- shadow-4.1.4.2/src/usermod.c.semange 2011-06-28 15:49:22.897129091 +0200 -+++ shadow-4.1.4.2/src/usermod.c 2011-06-28 15:57:56.509845476 +0200 +--- shadow-4.1.4.2/src/usermod.c.semange 2009-05-22 12:42:53.000000000 +0200 ++++ shadow-4.1.4.2/src/usermod.c 2011-08-02 13:54:12.355225884 +0200 @@ -82,6 +82,9 @@ #define E_GRP_UPDATE 10 /* can't update group file */ /* #define E_NOSPACE 11 insufficient space to move home dir */ diff --git a/shadow-utils.spec b/shadow-utils.spec index 0761e82..076a963 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.4.2 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2 @@ -196,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/vigr.8* %changelog +* Tue Aug 02 2011 Peter Vrabec - 2:4.1.4.2-13 +- fixing semanage issue (#701355) + * Wed Jun 29 2011 Peter Vrabec - 2:4.1.4.2-12 - userdel option to remove Linux login <-> SELinux login mapping (#639900) - useradd special exit value if SELinux user mapping is invalid (#639975)