From owner-svn-src-head@freebsd.org  Sun Aug  2 12:56:26 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 2352E9B0DB5;
 Sun,  2 Aug 2015 12:56:26 +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 13CCF259;
 Sun,  2 Aug 2015 12:56:26 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t72CuPqK036266;
 Sun, 2 Aug 2015 12:56:25 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t72CuPPk036265;
 Sun, 2 Aug 2015 12:56:25 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201508021256.t72CuPPk036265@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: Sun, 2 Aug 2015 12:56:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286199 - head/usr.sbin/pw
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Aug 2015 12:56:26 -0000

Author: bapt
Date: Sun Aug  2 12:56:25 2015
New Revision: 286199
URL: https://svnweb.freebsd.org/changeset/base/286199

Log:
  Fix regression: report if a group already exists when creating it

Modified:
  head/usr.sbin/pw/pw_group.c

Modified: head/usr.sbin/pw/pw_group.c
==============================================================================
--- head/usr.sbin/pw/pw_group.c	Sun Aug  2 12:54:15 2015	(r286198)
+++ head/usr.sbin/pw/pw_group.c	Sun Aug  2 12:56:25 2015	(r286199)
@@ -546,6 +546,8 @@ pw_group_add(int argc, char **argv, char
 		freopen(_PATH_DEVNULL, "w", stderr);
 	if (name == NULL)
 		errx(EX_DATAERR, "group name required");
+	if (GETGRNAM(name) != NULL)
+		errx(EX_DATAERR, "group name `%s' already exists", name);
 	cnf = get_userconfig(cfg);
 	rc = groupadd(cnf, name, gr_gidpolicy(cnf, id), members, fd, dryrun,
 	    pretty, precrypted);