[Pkg-shadow-commits] r2691 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-15 21:14:08 +0000 (Wed, 15 Apr 2009)
New Revision: 2691

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/useradd.c
   upstream/trunk/src/userdel.c
Log:
	* NEWS, src/userdel.c: Fixed SE Linux support. semanage should be
	called at the end.
	* src/useradd.c: Always call selinux_update_mapping() (i.e.
	semanage), not only when -Z is used.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-15 17:50:17 UTC (rev 2690)
+++ upstream/trunk/ChangeLog	2009-04-15 21:14:08 UTC (rev 2691)
@@ -1,5 +1,12 @@
 2009-04-15  Peter Vrabec <pvrabec at redhat.com>
 
+	* NEWS, src/userdel.c: Fixed SE Linux support. semanage should be
+	called at the end.
+	* src/useradd.c: Always call selinux_update_mapping() (i.e.
+	semanage), not only when -Z is used.
+
+2009-04-15  Peter Vrabec <pvrabec at redhat.com>
+
 	* NEWS, srclib/getlong.c: Fix parsing of octal numbers.
 
 2009-04-15  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2009-04-15 17:50:17 UTC (rev 2690)
+++ upstream/trunk/NEWS	2009-04-15 21:14:08 UTC (rev 2691)
@@ -8,12 +8,14 @@
   weirdly). Only shadow-4.1.3 was affected.
 
 *** general
+- login
+  * Fix regression when no user is specified on the command line.
+- userdel
+  * Fixed SE Linux support
 - vipw
   * SE Linux: Set the default context to the context of the file being
     edited. This ensures that the backup file inherit from the file's
     context.
-- login
-  * Fix regression when no user is specified on the command line.
 
 shadow-4.1.2.2 -> shadow-4.1.3						2009-04-12
 

Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c	2009-04-15 17:50:17 UTC (rev 2690)
+++ upstream/trunk/src/useradd.c	2009-04-15 21:14:08 UTC (rev 2691)
@@ -2010,9 +2010,7 @@
 	close_files ();
 
 #ifdef WITH_SELINUX
-	if (Zflg) {
-		selinux_update_mapping ();
-	}
+	selinux_update_mapping ();
 #endif
 
 	nscd_flush_cache ("passwd");

Modified: upstream/trunk/src/userdel.c
===================================================================
--- upstream/trunk/src/userdel.c	2009-04-15 17:50:17 UTC (rev 2690)
+++ upstream/trunk/src/userdel.c	2009-04-15 21:14:08 UTC (rev 2691)
@@ -797,17 +797,6 @@
 	audit_help_open ();
 #endif
 
-#ifdef WITH_SELINUX
-	if (is_selinux_enabled () > 0) {
-		const char *args[5];
-		args[0] = "/usr/sbin/semanage";
-		args[1] = "login";
-		args[2] = "-d";
-		args[3] = user_name;
-		args[4] = NULL;
-		safe_system (args[0], args, NULL, 1);
-	}
-#endif
 	/*
 	 * Get my name so that I can use it to report errors.
 	 */
@@ -1010,6 +999,18 @@
 	}
 #endif
 
+#ifdef WITH_SELINUX
+	if (is_selinux_enabled () > 0) {
+		const char *args[5];
+		args[0] = "/usr/sbin/semanage";
+		args[1] = "login";
+		args[2] = "-d";
+		args[3] = user_name;
+		args[4] = NULL;
+		safe_system (args[0], args, NULL, 1);
+	}
+#endif
+
 	/*
 	 * Cancel any crontabs or at jobs. Have to do this before we remove
 	 * the entry from /etc/passwd.