From owner-svn-src-head@freebsd.org  Fri Aug 21 14:28:16 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 012AD9BFCAF;
 Fri, 21 Aug 2015 14:28:16 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E5CA983F;
 Fri, 21 Aug 2015 14:28:15 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LESFgg005804;
 Fri, 21 Aug 2015 14:28:15 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7LESFPX005802;
 Fri, 21 Aug 2015 14:28:15 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201508211428.t7LESFPX005802@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 21 Aug 2015 14:28:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286993 - in head/usr.sbin/pw: . tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Aug 2015 14:28:16 -0000

Author: bapt
Date: Fri Aug 21 14:28:14 2015
New Revision: 286993
URL: https://svnweb.freebsd.org/changeset/base/286993

Log:
  Fix err pointer not initialized to NULL resulting
  
  Reported by:	"O. Hartmann" <ohartman@zedat.fu-berlin.de>

Modified:
  head/usr.sbin/pw/strtounum.c
  head/usr.sbin/pw/tests/pw_useradd.sh

Modified: head/usr.sbin/pw/strtounum.c
==============================================================================
--- head/usr.sbin/pw/strtounum.c	Fri Aug 21 14:15:54 2015	(r286992)
+++ head/usr.sbin/pw/strtounum.c	Fri Aug 21 14:28:14 2015	(r286993)
@@ -41,6 +41,7 @@ strtounum(const char * __restrict np, ui
 	char *endp;
 	uintmax_t ret;
 
+	*errpp = NULL;
 	if (minval > maxval) {
 		errno = EINVAL;
 		if (errpp != NULL)

Modified: head/usr.sbin/pw/tests/pw_useradd.sh
==============================================================================
--- head/usr.sbin/pw/tests/pw_useradd.sh	Fri Aug 21 14:15:54 2015	(r286992)
+++ head/usr.sbin/pw/tests/pw_useradd.sh	Fri Aug 21 14:28:14 2015	(r286993)
@@ -338,6 +338,20 @@ user_add_w_yes_body() {
 		grep "^foo" ${HOME}/master.passwd
 }
 
+atf_test_case user_add_with_pw_conf
+user_add_with_pw_conf_body()
+{
+	populate_etc_skel
+	atf_check -s exit:0 \
+		${PW} useradd -D -C ${HOME}/pw.conf \
+		-u 2000,32767 -i 2000,32767
+	atf_check -s exit:0 \
+		-o inline:"minuid = 2000\nmaxuid = 32767\nmingid = 2000\nmaxgid = 32767\n" \
+		grep "^m.*id =" ${HOME}/pw.conf
+	atf_check -s exit:0 \
+		${PW} useradd foo -C ${HOME}/pw.conf
+}
+
 atf_init_test_cases() {
 	atf_add_test_case user_add
 	atf_add_test_case user_add_noupdate
@@ -367,4 +381,5 @@ atf_init_test_cases() {
 	atf_add_test_case user_add_bad_shell
 	atf_add_test_case user_add_already_exists
 	atf_add_test_case user_add_w_yes
+	atf_add_test_case user_add_with_pw_conf
 }