From owner-svn-src-all@FreeBSD.ORG  Tue Nov 20 14:03:10 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 08EA1F5C;
 Tue, 20 Nov 2012 14:03:10 +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 E20588FC0C;
 Tue, 20 Nov 2012 14:03:09 +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 qAKE39l0032118;
 Tue, 20 Nov 2012 14:03:09 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAKE39AM032117;
 Tue, 20 Nov 2012 14:03:09 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201211201403.qAKE39AM032117@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 20 Nov 2012 14:03:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243334 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 20 Nov 2012 14:03:10 -0000

Author: bapt
Date: Tue Nov 20 14:03:09 2012
New Revision: 243334
URL: http://svnweb.freebsd.org/changeset/base/243334

Log:
  only rename(2) after chmod(2) has succeed
  report error if chmod(2) fails
  
  Reported by:	jh

Modified:
  head/lib/libutil/gr_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Tue Nov 20 12:32:18 2012	(r243333)
+++ head/lib/libutil/gr_util.c	Tue Nov 20 14:03:09 2012	(r243334)
@@ -318,14 +318,10 @@ gr_copy(int ffd, int tfd, const struct g
 int
 gr_mkdb(void)
 {
-	int ret;
+	if (chmod(tempname, 0644) != 0)
+		return (-1);
 
-	ret = rename(tempname, group_file);
-
-	if (ret == 0)
-		chmod(group_file, 0644);
-
-	return (ret);
+	return (rename(tempname, group_file));
 }
 
 /*