From owner-svn-src-all@FreeBSD.ORG  Sun Dec 14 10:37:18 2014
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: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 B3FA852E;
 Sun, 14 Dec 2014 10:37:18 +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 9FBA08DE;
 Sun, 14 Dec 2014 10:37:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEAbIwa093618;
 Sun, 14 Dec 2014 10:37:18 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEAbIZG093617;
 Sun, 14 Dec 2014 10:37:18 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201412141037.sBEAbIZG093617@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: Sun, 14 Dec 2014 10:37:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275755 - head/usr.sbin/autofs
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.18-1
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: Sun, 14 Dec 2014 10:37:18 -0000

Author: trasz
Date: Sun Dec 14 10:37:17 2014
New Revision: 275755
URL: https://svnweb.freebsd.org/changeset/base/275755

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

Modified:
  head/usr.sbin/autofs/automountd.c

Modified: head/usr.sbin/autofs/automountd.c
==============================================================================
--- head/usr.sbin/autofs/automountd.c	Sun Dec 14 09:34:55 2014	(r275754)
+++ head/usr.sbin/autofs/automountd.c	Sun Dec 14 10:37:17 2014	(r275755)
@@ -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);
 }
 
 /*