* libmisc/user_busy.c, src/userdel.c, src/usermod.c: Warn in

	user_busy() rather than in src/userdel.c or src/usermod.c to
	provide more accurate failure cause (user is logged in or user
	still executes processes).

diff --git a/ChangeLog b/ChangeLog
index 3b9e687c5604c05f130c07d9ae4aed63d14bd4e5..945d9e24b7c43ddd4d8f939d42f3dbbf687c1ad2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-15  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * libmisc/user_busy.c, src/userdel.c, src/usermod.c: Warn in
+       user_busy() rather than in src/userdel.c or src/usermod.c to
+       provide more accurate failure cause (user is logged in or user
+       still executes processes).
+
 2010-02-15  Nicolas François  <nicolas.francois@centraliens.net>
 
        * lib/groupio.c, lib/sgroupio.c, lib/shadowio.c, lib/pwio.c: Check

diff --git a/src/userdel.c b/src/userdel.c
index 8f2ac0fec1a6a00fb9de54f83c4e08ab16fbcfd9..49edac707dd94b71162b78dbcbb89d04df896387 100644 (file)
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -936,9 +936,6 @@ int main (int argc, char **argv)
         * a cron job may be started on her behalf, etc.
         */
        if (user_busy (user_name, user_id) != 0) {
-               fprintf (stderr,
-                        _("%s: user %s is currently logged in\n"),
-                        Prog, user_name);
                if (!fflg) {
 #ifdef WITH_AUDIT
                        audit_logger (AUDIT_DEL_USER, Prog,

diff --git a/src/usermod.c b/src/usermod.c
index 9cdb9bb1fefefe6c94c5fc34990e04cbab781c0d..11c925bef243eeb3d4c74ee425f94b18741c70d4 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1735,9 +1735,6 @@ int main (int argc, char **argv)
         */
        if (   (uflg || lflg || dflg)
            && (user_busy (user_name, user_id) != 0)) {
-               fprintf (stderr,
-                        _("%s: user %s is currently logged in\n"),
-                        Prog, user_name);
                exit (E_USER_BUSY);
        }