emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

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

Browse Source 
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:
nekral-guest
2011-02-16 20:46:27 +00:00
parent f4b544786c
commit ee163bed33
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2010-02-15 Nicolas François <nicolas.francois@centraliens.net>
* lib/groupio.c, lib/sgroupio.c, lib/shadowio.c, lib/pwio.c: Check * lib/groupio.c, lib/sgroupio.c, lib/shadowio.c, lib/pwio.c: Check

3
src/userdel.c
View File

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

3
src/usermod.c
View File

@ -1735,9 +1735,6 @@ int main (int argc, char **argv)
*/ */
if ( (uflg || lflg || dflg) if ( (uflg || lflg || dflg)
&& (user_busy (user_name, user_id) != 0)) { && (user_busy (user_name, user_id) != 0)) {
fprintf (stderr,
_("%s: user %s is currently logged in\n"),
Prog, user_name);
exit (E_USER_BUSY); exit (E_USER_BUSY);
} }