From owner-svn-src-stable@FreeBSD.ORG  Sat Mar  7 19:39:17 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E594DF5F;
 Sat,  7 Mar 2015 19:39:17 +0000 (UTC)
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 CFA3AB69;
 Sat,  7 Mar 2015 19:39:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t27JdHBR022224;
 Sat, 7 Mar 2015 19:39:17 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t27JdHNk022223;
 Sat, 7 Mar 2015 19:39:17 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201503071939.t27JdHNk022223@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 7 Mar 2015 19:39:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r279743 - stable/10/usr.sbin/autofs
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Mar 2015 19:39:18 -0000

Author: trasz
Date: Sat Mar  7 19:39:16 2015
New Revision: 279743
URL: https://svnweb.freebsd.org/changeset/base/279743

Log:
  MFC r275755:
  
  Fix spurious "child process X terminated with exit status 1" messages
  from automountd(8).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/autofs/automountd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/autofs/automountd.c
==============================================================================
--- stable/10/usr.sbin/autofs/automountd.c	Sat Mar  7 19:36:06 2015	(r279742)
+++ stable/10/usr.sbin/autofs/automountd.c	Sat Mar  7 19:39:16 2015	(r279743)
@@ -82,14 +82,8 @@ done(int request_error, bool wildcards)
 	    request_id, request_error);
 
 	error = ioctl(autofs_fd, AUTOFSDONE, &add);
-	if (error != 0) {
-		/*
-		 * Do this instead of log_err() to avoid calling
-		 * done() again with error, from atexit handler.
-		 */
+	if (error != 0)
 		log_warn("AUTOFSDONE");
-	}
-	quick_exit(1);
 }
 
 /*