From owner-svn-src-stable@FreeBSD.ORG  Mon Nov 12 14:19:06 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 03383235;
 Mon, 12 Nov 2012 14:19:06 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DBFDC8FC15;
 Mon, 12 Nov 2012 14:19:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACEJ5wt031928;
 Mon, 12 Nov 2012 14:19:05 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACEJ5sH031927;
 Mon, 12 Nov 2012 14:19:05 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201211121419.qACEJ5sH031927@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 12 Nov 2012 14:19:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r242919 - stable/7/usr.sbin/pw
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 14:19:06 -0000

Author: bapt
Date: Mon Nov 12 14:19:05 2012
New Revision: 242919
URL: http://svnweb.freebsd.org/changeset/base/242919

Log:
  MFC: r241107, r241108
  
  Remove useless atoi(3), previous strspn(3) makes sure that a_name->val is a
  number.
  This also allow pw user show to work as expected.
  
  PR:		bin/172112
  Submitted by:	Ilya A. Arkhipov <rum1cro@yandex.ru>

Modified:
  stable/7/usr.sbin/pw/pw_user.c
Directory Properties:
  stable/7/usr.sbin/pw/   (props changed)

Modified: stable/7/usr.sbin/pw/pw_user.c
==============================================================================
--- stable/7/usr.sbin/pw/pw_user.c	Mon Nov 12 14:16:39 2012	(r242918)
+++ stable/7/usr.sbin/pw/pw_user.c	Mon Nov 12 14:19:05 2012	(r242919)
@@ -325,7 +325,7 @@ pw_user(struct userconf * cnf, int mode,
 		 */
 		if (mode != M_ADD && pwd == NULL
 		    && strspn(a_name->val, "0123456789") == strlen(a_name->val)
-		    && atoi(a_name->val) > 0) {	/* Assume uid */
+		    && *a_name->val) {
 			(a_uid = a_name)->ch = 'u';
 			a_name = NULL;
 		}