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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-11 16:47:32 +0000 (Sat, 11 Apr 2009)
New Revision: 2648

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/useradd.c
   upstream/trunk/src/usermod.c
Log:
	* src/useradd.c, src/usermod.c: Only call selinux_update_mapping()
	if Zflg is set.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-11 16:24:06 UTC (rev 2647)
+++ upstream/trunk/ChangeLog	2009-04-11 16:47:32 UTC (rev 2648)
@@ -1,5 +1,10 @@
 2009-04-11  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/useradd.c, src/usermod.c: Only call selinux_update_mapping()
+	if Zflg is set.
+
+2009-04-11  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/getgr_nam_gid.c: Added support for NULL argument.
 	* libmisc/chowntty.c: Reuse getgr_nam_gid(), and get rid of atol().
 

Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c	2009-04-11 16:24:06 UTC (rev 2647)
+++ upstream/trunk/src/useradd.c	2009-04-11 16:47:32 UTC (rev 2648)
@@ -2003,7 +2003,9 @@
 	close_files ();
 
 #ifdef WITH_SELINUX
-	selinux_update_mapping ();
+	if (Zflg) {
+		selinux_update_mapping ();
+	}
 #endif
 
 	nscd_flush_cache ("passwd");

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2009-04-11 16:24:06 UTC (rev 2647)
+++ upstream/trunk/src/usermod.c	2009-04-11 16:47:32 UTC (rev 2648)
@@ -1759,7 +1759,9 @@
 	nscd_flush_cache ("group");
 
 #ifdef WITH_SELINUX
-	selinux_update_mapping ();
+	if (Zflg) {
+		selinux_update_mapping ();
+	}
 #endif
 
 	if (mflg) {