* 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).
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user