From owner-svn-src-all@FreeBSD.ORG  Fri Jun 29 13:00:29 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C156106564A;
	Fri, 29 Jun 2012 13:00:29 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 664018FC0A;
	Fri, 29 Jun 2012 13:00:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TD0TnV047040;
	Fri, 29 Jun 2012 13:00:29 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TD0Tlg047038;
	Fri, 29 Jun 2012 13:00:29 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201206291300.q5TD0Tlg047038@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 29 Jun 2012 13:00:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237778 - stable/9/lib/libutil
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jun 2012 13:00:29 -0000

Author: bapt
Date: Fri Jun 29 13:00:28 2012
New Revision: 237778
URL: http://svn.freebsd.org/changeset/base/237778

Log:
  MFC: r237268
  
  early MFC to get this important bugfix into 9.1
  
  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.
  
  Reported by:	Claude Buisson <clbuisson@orange.fr>
  Approved by:	des (mentor)

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

Modified: stable/9/lib/libutil/pw_util.c
==============================================================================
--- stable/9/lib/libutil/pw_util.c	Fri Jun 29 12:55:36 2012	(r237777)
+++ stable/9/lib/libutil/pw_util.c	Fri Jun 29 13:00:28 2012	(r237778)
@@ -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);