From owner-svn-src-all@FreeBSD.ORG  Sun Feb  6 12:21:30 2011
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 033161065696;
	Sun,  6 Feb 2011 12:21:30 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E65538FC2B;
	Sun,  6 Feb 2011 12:21:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16CLTlB064676;
	Sun, 6 Feb 2011 12:21:29 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16CLTCm064674;
	Sun, 6 Feb 2011 12:21:29 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201102061221.p16CLTCm064674@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 6 Feb 2011 12:21:29 +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: r218370 - head/sbin/hastd
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: Sun, 06 Feb 2011 12:21:30 -0000

Author: pjd
Date: Sun Feb  6 12:21:29 2011
New Revision: 218370
URL: http://svn.freebsd.org/changeset/base/218370

Log:
  Close more descriptors that can be open if the worker process for the given
  resource is already running.
  
  Submitted by:	Mikolaj Golub <to.my.trociny@gmail.com>
  MFC after:	1 week

Modified:
  head/sbin/hastd/hastd.c

Modified: head/sbin/hastd/hastd.c
==============================================================================
--- head/sbin/hastd/hastd.c	Sun Feb  6 11:39:51 2011	(r218369)
+++ head/sbin/hastd/hastd.c	Sun Feb  6 12:21:29 2011	(r218370)
@@ -109,6 +109,12 @@ descriptors_cleanup(struct hast_resource
 			proto_close(tres->hr_remotein);
 		if (tres->hr_remoteout != NULL)
 			proto_close(tres->hr_remoteout);
+		if (tres->hr_ctrl != NULL)
+			proto_close(tres->hr_ctrl);
+		if (tres->hr_event != NULL)
+			proto_close(tres->hr_event);
+		if (tres->hr_conn != NULL)
+			proto_close(tres->hr_conn);
 	}
 	if (cfg->hc_controlin != NULL)
 		proto_close(cfg->hc_controlin);