From owner-svn-src-head@FreeBSD.ORG  Sun Feb  9 21:42:02 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8D9BC356;
 Sun,  9 Feb 2014 21:42:02 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76C261A2A;
 Sun,  9 Feb 2014 21:42:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19Lg2NU042375;
 Sun, 9 Feb 2014 21:42:02 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19Lg2vW042374;
 Sun, 9 Feb 2014 21:42:02 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201402092142.s19Lg2vW042374@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 9 Feb 2014 21:42:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261692 - head/sbin/casperd
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.17
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: Sun, 09 Feb 2014 21:42:02 -0000

Author: pjd
Date: Sun Feb  9 21:42:01 2014
New Revision: 261692
URL: http://svnweb.freebsd.org/changeset/base/261692

Log:
  If the main casperd process exits, zygote process should exit as well
  instead of spinning.
  
  Reported by:	Mikhail <mp@lenta.ru>

Modified:
  head/sbin/casperd/zygote.c

Modified: head/sbin/casperd/zygote.c
==============================================================================
--- head/sbin/casperd/zygote.c	Sun Feb  9 21:27:32 2014	(r261691)
+++ head/sbin/casperd/zygote.c	Sun Feb  9 21:42:01 2014	(r261692)
@@ -132,8 +132,13 @@ zygote_main(int sock)
 
 	for (;;) {
 		nvlin = nvlist_recv(sock);
-		if (nvlin == NULL)
+		if (nvlin == NULL) {
+			if (errno == ENOTCONN) {
+				/* Casperd exited. */
+				exit(0);
+			}
 			continue;
+		}
 		func = (zygote_func_t *)(uintptr_t)nvlist_get_number(nvlin,
 		    "func");
 		flags = (int)nvlist_get_number(nvlin, "flags");