From owner-svn-src-head@FreeBSD.ORG  Sun Feb 21 19:56:47 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 686A5106566C;
	Sun, 21 Feb 2010 19:56:47 +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 572828FC14;
	Sun, 21 Feb 2010 19:56:47 +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 o1LJulWJ023221;
	Sun, 21 Feb 2010 19:56:47 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1LJul9N023219;
	Sun, 21 Feb 2010 19:56:47 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201002211956.o1LJul9N023219@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 21 Feb 2010 19:56:47 +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: r204177 - head/sbin/hastd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 21 Feb 2010 19:56:47 -0000

Author: pjd
Date: Sun Feb 21 19:56:47 2010
New Revision: 204177
URL: http://svn.freebsd.org/changeset/base/204177

Log:
  Changing proto_socketpair.c compilation and linking order revealed
  a problem - we should simply ignore proto_server() if address
  doesn't start with socketpair://, and not abort.

Modified:
  head/sbin/hastd/proto_socketpair.c

Modified: head/sbin/hastd/proto_socketpair.c
==============================================================================
--- head/sbin/hastd/proto_socketpair.c	Sun Feb 21 19:53:33 2010	(r204176)
+++ head/sbin/hastd/proto_socketpair.c	Sun Feb 21 19:56:47 2010	(r204177)
@@ -91,9 +91,12 @@ sp_connect(void *ctx __unused)
 }
 
 static int
-sp_server(const char *addr __unused, void **ctxp __unused)
+sp_server(const char *addr, void **ctxp __unused)
 {
 
+	if (strcmp(addr, "socketpair://") != 0)
+		return (-1);
+
 	assert(!"proto_server() not supported on socketpairs");
 	abort();
 }