From owner-svn-src-all@FreeBSD.ORG  Sun Oct 24 15:44:23 2010
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 55016106564A;
	Sun, 24 Oct 2010 15:44:23 +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 439158FC13;
	Sun, 24 Oct 2010 15:44:23 +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 o9OFiNq4032718;
	Sun, 24 Oct 2010 15:44:23 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9OFiNXZ032716;
	Sun, 24 Oct 2010 15:44:23 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201010241544.o9OFiNXZ032716@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 24 Oct 2010 15:44:23 +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: r214276 - 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, 24 Oct 2010 15:44:23 -0000

Author: pjd
Date: Sun Oct 24 15:44:23 2010
New Revision: 214276
URL: http://svn.freebsd.org/changeset/base/214276

Log:
  Simplify code a bit.
  
  MFC after:	3 days

Modified:
  head/sbin/hastd/secondary.c

Modified: head/sbin/hastd/secondary.c
==============================================================================
--- head/sbin/hastd/secondary.c	Sun Oct 24 15:42:16 2010	(r214275)
+++ head/sbin/hastd/secondary.c	Sun Oct 24 15:44:23 2010	(r214276)
@@ -318,10 +318,8 @@ init_remote(struct hast_resource *res, s
 		    (uintmax_t)res->hr_secondary_remotecnt);
 	}
 	if (hast_proto_send(res, res->hr_remotein, nvout, map, mapsize) < 0) {
-		pjdlog_errno(LOG_WARNING, "Unable to send activemap to %s",
+		pjdlog_exit(EX_TEMPFAIL, "Unable to send activemap to %s",
 		    res->hr_remoteaddr);
-		nv_free(nvout);
-		exit(EX_TEMPFAIL);
 	}
 	if (map != NULL)
 		free(map);