userdel: fix userdel -f with /etc/subuid present (#1316168)

shadow-4.2.1-user-busy.patch

@@ -0,0 +1,48 @@
+From d2fa8c5d4b0b19445562daf78d3a62421fe8d6b8 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <bastian.blank@credativ.de>
+Date: Tue, 17 Nov 2015 10:52:24 -0600
+Subject: [PATCH] Fix user busy errors at userdel
+
+From: Bastian Blank <bastian.blank@credativ.de>
+Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+---
+ libmisc/user_busy.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/libmisc/user_busy.c b/libmisc/user_busy.c
+index db7174a..0db32c3 100644
+--- a/libmisc/user_busy.c
++++ b/libmisc/user_busy.c
+@@ -175,6 +175,9 @@ static int user_busy_processes (const char *name, uid_t uid)
+ 	if (stat ("/", &sbroot) != 0) {
+ 		perror ("stat (\"/\")");
+ 		(void) closedir (proc);
++#ifdef ENABLE_SUBIDS
++		sub_uid_close();
++#endif
+ 		return 0;
+ 	}
+ 
+@@ -212,6 +215,9 @@ static int user_busy_processes (const char *name, uid_t uid)
+ 
+ 		if (check_status (name, tmp_d_name, uid) != 0) {
+ 			(void) closedir (proc);
++#ifdef ENABLE_SUBIDS
++			sub_uid_close();
++#endif
+ 			fprintf (stderr,
+ 			         _("%s: user %s is currently used by process %d\n"),
+ 			         Prog, name, pid);
+@@ -232,6 +238,9 @@ static int user_busy_processes (const char *name, uid_t uid)
+ 				}
+ 				if (check_status (name, task_path+6, uid) != 0) {
+ 					(void) closedir (proc);
++#ifdef ENABLE_SUBIDS
++					sub_uid_close();
++#endif
+ 					fprintf (stderr,
+ 					         _("%s: user %s is currently used by process %d\n"),
+ 					         Prog, name, pid);
+-- 
+2.5.0
+

shadow-utils.spec

@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.2.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.xz
@@ -34,6 +34,7 @@ Patch23: shadow-4.2.1-usermod-unlock.patch
 Patch24: shadow-4.2.1-no-lock-dos.patch
 Patch25: shadow-4.2.1-defs-chroot.patch
 Patch26: shadow-4.2.1-lastlog-unexpire.patch
+Patch27: shadow-4.2.1-user-busy.patch
 
 License: BSD and GPLv2+
 Group: System Environment/Base
@@ -88,6 +89,7 @@ are used for managing group accounts.
 %patch24 -p1 -b .no-lock-dos
 %patch25 -p1 -b .defs-chroot
 %patch26 -p1 -b .unexpire
+%patch27 -p1 -b .user-busy
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -254,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Thu Mar 17 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-8
+- userdel: fix userdel -f with /etc/subuid present (#1316168)
+
 * Tue Feb  9 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-7
 - usermod: properly return error during password manipulation