Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Feb 2010 19:56:47 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r204177 - head/sbin/hastd
Message-ID:  <201002211956.o1LJul9N023219@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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();
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002211956.o1LJul9N023219>