[Pkg-shadow-commits] r3298 - in upstream/trunk: . src
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Wed Feb 16 20:46:28 UTC 2011
Author: nekral-guest
Date: 2011-02-16 20:46:27 +0000 (Wed, 16 Feb 2011)
New Revision: 3298
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/userdel.c
upstream/trunk/src/usermod.c
Log:
* 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).
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2011-02-16 20:33:16 UTC (rev 3297)
+++ upstream/trunk/ChangeLog 2011-02-16 20:46:27 UTC (rev 3298)
@@ -1,5 +1,12 @@
2010-02-15 Nicolas François <nicolas.francois at 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 at centraliens.net>
+
* lib/groupio.c, lib/sgroupio.c, lib/shadowio.c, lib/pwio.c: Check
entry validity before commits to databases.
* libmisc/fields.c, libmisc/Makefile.am, lib/fields.c,
Modified: upstream/trunk/src/userdel.c
===================================================================
--- upstream/trunk/src/userdel.c 2011-02-16 20:33:16 UTC (rev 3297)
+++ upstream/trunk/src/userdel.c 2011-02-16 20:46:27 UTC (rev 3298)
@@ -936,9 +936,6 @@
* 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,
Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c 2011-02-16 20:33:16 UTC (rev 3297)
+++ upstream/trunk/src/usermod.c 2011-02-16 20:46:27 UTC (rev 3298)
@@ -1735,9 +1735,6 @@
*/
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);
}
More information about the Pkg-shadow-commits
mailing list