* src/useradd.c, src/usermod.c: Only call selinux_update_mapping()

	if Zflg is set.

diff --git a/ChangeLog b/ChangeLog
index ea829baaad8c52ce72a223f6585b2fd85fef57ba..a4690dc7fc685adbafabc20f2ac1e9948a5c8980 100644 (file)
--- 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 444cc22edf60e046134848462bc35b3ea6752c59..89575dbd83337122262c0c4a74dd9a0ae9acda92 100644 (file)
--- 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 e860c3685598d741bd3a3e9baed4f62f41513def..5b337fa3dcc1c362109e612dc013b538e02779fb 100644 (file)
--- 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) {