svn commit: r248120 - stable/8/lib/libutil

[Baptiste Daroussin]

Author: bapt
Date: Sun Mar 10 00:36:28 2013
New Revision: 248120
URL: http://svnweb.freebsd.org/changeset/base/248120

Log:
  MFC r237268
  
  Revert user comparison back to user names as some user can share uids
  (root/toor for example)
  
  get the username information from old_pw structures to still allow renaming
  of a user.
  
  Approved by:	re (jpaetzel)

Modified:
  stable/8/lib/libutil/pw_util.c
Directory Properties:
  stable/8/lib/libutil/   (props changed)

Modified: stable/8/lib/libutil/pw_util.c
==============================================================================
--- stable/8/lib/libutil/pw_util.c	Sat Mar  9 23:55:23 2013	(r248119)
+++ stable/8/lib/libutil/pw_util.c	Sun Mar 10 00:36:28 2013	(r248120)
@@ -436,14 +436,21 @@ pw_copy(int ffd, int tfd, const struct p
 	size_t len;
 	int eof, readlen;
 
-	spw = pw;
+	if (old_pw == NULL && pw == NULL)
+			return (-1);
+
+	spw = old_pw;
+	/* deleting a user */
 	if (pw == NULL) {
 		line = NULL;
-		if (old_pw == NULL)
+	} else {
+		if ((line = pw_make(pw)) == NULL)
 			return (-1);
-		spw = old_pw;
-	} else if ((line = pw_make(pw)) == NULL)
-		return (-1);
+	}
+
+	/* adding a user */
+	if (spw == NULL)
+		spw = pw;
 
 	eof = 0;
 	len = 0;
@@ -510,7 +517,7 @@ pw_copy(int ffd, int tfd, const struct p
 		 */
 
 		*q = t;
-		if (fpw == NULL || fpw->pw_uid != spw->pw_uid) {
+		if (fpw == NULL || strcmp(fpw->pw_name, spw->pw_name) != 0) {
 			/* nope */
 			if (fpw != NULL)
 				free(fpw);