From owner-svn-src-head@FreeBSD.ORG  Thu May 28 05:38:08 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9382742E;
 Thu, 28 May 2015 05:38:08 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from svn.freebsd.org (svn.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 81799E10;
 Thu, 28 May 2015 05:38:08 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4S5c8CR089799;
 Thu, 28 May 2015 05:38:08 GMT (envelope-from pkelsey@FreeBSD.org)
Received: (from pkelsey@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4S5c8hh089798;
 Thu, 28 May 2015 05:38:08 GMT (envelope-from pkelsey@FreeBSD.org)
Message-Id: <201505280538.t4S5c8hh089798@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pkelsey set sender to
 pkelsey@FreeBSD.org using -f
From: Patrick Kelsey <pkelsey@FreeBSD.org>
Date: Thu, 28 May 2015 05:38:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r283641 - head/sbin/dhclient
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: Thu, 28 May 2015 05:38:08 -0000

Author: pkelsey
Date: Thu May 28 05:38:07 2015
New Revision: 283641
URL: https://svnweb.freebsd.org/changeset/base/283641

Log:
  Add CAP_FCNTL to the lease file capsicum rights, and limit to
  CAP_FCNTL_GETFL.  Without CAP_FCNTL_GETFL, the lease file truncation
  in rewrite_client_leases() will fail to trim old data when rewriting
  the file with a lesser amount of data.
  
  Reviewed by: pjd, rwatson
  Approved by: jmallett (mentor)
  MFC after: 1 week

Modified:
  head/sbin/dhclient/dhclient.c

Modified: head/sbin/dhclient/dhclient.c
==============================================================================
--- head/sbin/dhclient/dhclient.c	Thu May 28 00:11:36 2015	(r283640)
+++ head/sbin/dhclient/dhclient.c	Thu May 28 05:38:07 2015	(r283641)
@@ -1845,12 +1845,16 @@ rewrite_client_leases(void)
 		leaseFile = fopen(path_dhclient_db, "w");
 		if (!leaseFile)
 			error("can't create %s: %m", path_dhclient_db);
-		cap_rights_init(&rights, CAP_FSTAT, CAP_FSYNC, CAP_FTRUNCATE,
-		    CAP_SEEK, CAP_WRITE);
+		cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_FSYNC,
+		    CAP_FTRUNCATE, CAP_SEEK, CAP_WRITE);
 		if (cap_rights_limit(fileno(leaseFile), &rights) < 0 &&
 		    errno != ENOSYS) {
 			error("can't limit lease descriptor: %m");
 		}
+		if (cap_fcntls_limit(fileno(leaseFile), CAP_FCNTL_GETFL) < 0 &&
+		    errno != ENOSYS) {
+			error("can't limit lease descriptor fcntls: %m");
+		}
 	} else {
 		fflush(leaseFile);
 		rewind(leaseFile);