From owner-svn-src-all@FreeBSD.ORG  Mon Feb  6 14:11:24 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9F9D6106566B;
	Mon,  6 Feb 2012 14:11:24 +0000 (UTC)
	(envelope-from ghelmer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E89C8FC08;
	Mon,  6 Feb 2012 14:11:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q16EBOx7039271;
	Mon, 6 Feb 2012 14:11:24 GMT (envelope-from ghelmer@svn.freebsd.org)
Received: (from ghelmer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q16EBOwt039268;
	Mon, 6 Feb 2012 14:11:24 GMT (envelope-from ghelmer@svn.freebsd.org)
Message-Id: <201202061411.q16EBOwt039268@svn.freebsd.org>
From: Guy Helmer <ghelmer@FreeBSD.org>
Date: Mon, 6 Feb 2012 14:11:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231087 - head/lib/libutil
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 06 Feb 2012 14:11:24 -0000

Author: ghelmer
Date: Mon Feb  6 14:11:24 2012
New Revision: 231087
URL: http://svn.freebsd.org/changeset/base/231087

Log:
  Using the O_CLOEXEC flag on open(2) caused the pidfile lock to be lost
  when the child process execs daemon's target program thanks to flock(2)
  semantics. So, we apparently have to leak the open pidfile's file
  descriptor to keep the lock for the pidfile(3) functions to work properly.
  
  Test case demonstrated by trociny:
  
  ref8-amd64:/home/trociny% uname -r
  8.2-STABLE
  ref8-amd64:/home/trociny% daemon -p /tmp/sleep.pid sleep 10
  ref8-amd64:/home/trociny% daemon -p /tmp/sleep.pid sleep 10
  daemon: process already running, pid: 19799
  
  kopusha:~% uname -r
  10.0-CURRENT
  kopusha:~% daemon -p /tmp/sleep.pid sleep 10
  kopusha:~% daemon -p /tmp/sleep.pid sleep 10
  kopusha:~%

Modified:
  head/lib/libutil/pidfile.c

Modified: head/lib/libutil/pidfile.c
==============================================================================
--- head/lib/libutil/pidfile.c	Mon Feb  6 13:36:49 2012	(r231086)
+++ head/lib/libutil/pidfile.c	Mon Feb  6 14:11:24 2012	(r231087)
@@ -124,7 +124,7 @@ pidfile_open(const char *path, mode_t mo
 	 * pidfile_write() can be called multiple times.
 	 */
 	fd = flopen(pfh->pf_path,
-	    O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NONBLOCK, mode);
+	    O_WRONLY | O_CREAT | O_TRUNC | O_NONBLOCK, mode);
 	if (fd == -1) {
 		if (errno == EWOULDBLOCK && pidptr != NULL) {
 			count = 20;