From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Thu, 14 Jul 2011 13:29:48 +0000 (+0000)
Subject: 	* src/usermod.c (new_pwent): Document that pw_locate will not fail
X-Git-Tag: 4.1.5~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c23e851074558337f0f21f99bcb1263b2a330b75;p=shadow

	* src/usermod.c (new_pwent): Document that pw_locate will not fail
	because getpwnam returned successfully.
---

diff --git a/ChangeLog b/ChangeLog
index 3f95e7a5..38b0ed30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@
 	* man/usermod.8.xml: Document behavior of an empty EXPIRE_DATE.
 	* man/usermod.8.xml: Document that the mail spool might have to be
 	renamed (as for the homedir)
+	* src/usermod.c (new_pwent): Document that pw_locate will not fail
+	because getpwnam returned successfully.
 
 2011-07-08  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/src/usermod.c b/src/usermod.c
index d4bd5b16..1f3ebb76 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -402,6 +402,10 @@ static void new_pwent (struct passwd *pwent)
 {
 	if (lflg) {
 		if (pw_locate (user_newname) != NULL) {
+			/* This should never happen.
+			 * It was already checked that the user doesn't
+			 * exist on the system.
+			 */
 			fprintf (stderr,
 			         _("%s: user '%s' already exists in %s\n"),
 			         Prog, user_newname, pw_dbname ());