From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 11 Apr 2009 16:47:32 +0000 (+0000)
Subject: 	* src/useradd.c, src/usermod.c: Only call selinux_update_mapping()
X-Git-Tag: 4.1.3~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fdefd3e40e5102946500be0b600e8f5bbad5d1d;p=shadow

	* src/useradd.c, src/usermod.c: Only call selinux_update_mapping()
	if Zflg is set.
---

diff --git a/ChangeLog b/ChangeLog
index ea829baa..a4690dc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-11  Nicolas François  <nicolas.francois@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@centraliens.net>
 
 	* libmisc/getgr_nam_gid.c: Added support for NULL argument.
diff --git a/src/useradd.c b/src/useradd.c
index 444cc22e..89575dbd 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -2003,7 +2003,9 @@ int main (int argc, char **argv)
 	close_files ();
 
 #ifdef WITH_SELINUX
-	selinux_update_mapping ();
+	if (Zflg) {
+		selinux_update_mapping ();
+	}
 #endif
 
 	nscd_flush_cache ("passwd");
diff --git a/src/usermod.c b/src/usermod.c
index e860c368..5b337fa3 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1759,7 +1759,9 @@ int main (int argc, char **argv)
 	nscd_flush_cache ("group");
 
 #ifdef WITH_SELINUX
-	selinux_update_mapping ();
+	if (Zflg) {
+		selinux_update_mapping ();
+	}
 #endif
 
 	if (mflg) {