From owner-svn-src-head@freebsd.org  Sun Nov 12 08:54:24 2017
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 ED517E6CA55;
 Sun, 12 Nov 2017 08:54:24 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 BA48081E45;
 Sun, 12 Nov 2017 08:54:24 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAC8sNnT015112;
 Sun, 12 Nov 2017 08:54:23 GMT (envelope-from oshogbo@FreeBSD.org)
Received: (from oshogbo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAC8sN5n015111;
 Sun, 12 Nov 2017 08:54:23 GMT (envelope-from oshogbo@FreeBSD.org)
Message-Id: <201711120854.vAC8sN5n015111@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to
 oshogbo@FreeBSD.org using -f
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Date: Sun, 12 Nov 2017 08:54:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325741 - head/sbin/dhclient
X-SVN-Group: head
X-SVN-Commit-Author: oshogbo
X-SVN-Commit-Paths: head/sbin/dhclient
X-SVN-Commit-Revision: 325741
X-SVN-Commit-Repository: base
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.25
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: Sun, 12 Nov 2017 08:54:25 -0000

Author: oshogbo
Date: Sun Nov 12 08:54:23 2017
New Revision: 325741
URL: https://svnweb.freebsd.org/changeset/base/325741

Log:
  dhclient(8) should not close stdio using daemon(3) function.
  
  dhclient(8) is chrooted so opening /dev/null always will fail.
  In capability world this is also annoying because we getting error that
  open(2) is not permitted in Capsicum. dhclient(8) is closing stdio by
  precaching fd to /dev/null before chroot.
  This is done few lines below daemon(3) function so let's not try to do that
  in daemon(3) function.
  
  Reviewed by:	cem@
  Differential Revision:	https://reviews.freebsd.org/D12826

Modified:
  head/sbin/dhclient/dhclient.c

Modified: head/sbin/dhclient/dhclient.c
==============================================================================
--- head/sbin/dhclient/dhclient.c	Sun Nov 12 08:42:43 2017	(r325740)
+++ head/sbin/dhclient/dhclient.c	Sun Nov 12 08:54:23 2017	(r325741)
@@ -2423,7 +2423,7 @@ go_daemon(void)
 	/* Stop logging to stderr... */
 	log_perror = 0;
 
-	if (daemon(1, 0) == -1)
+	if (daemon(1, 1) == -1)
 		error("daemon");
 
 	cap_rights_init(&rights);