From owner-svn-src-user@FreeBSD.ORG  Mon Jan  5 14:27:05 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4C347106566B;
	Mon,  5 Jan 2009 14:27:05 +0000 (UTC)
	(envelope-from piso@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 377E08FC16;
	Mon,  5 Jan 2009 14:27:05 +0000 (UTC)
	(envelope-from piso@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n05ER5U9098645;
	Mon, 5 Jan 2009 14:27:05 GMT (envelope-from piso@svn.freebsd.org)
Received: (from piso@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n05ER5AW098644;
	Mon, 5 Jan 2009 14:27:05 GMT (envelope-from piso@svn.freebsd.org)
Message-Id: <200901051427.n05ER5AW098644@svn.freebsd.org>
From: Paolo Pisati <piso@FreeBSD.org>
Date: Mon, 5 Jan 2009 14:27:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186777 - user/piso/sys/netinet/libalias
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2009 14:27:05 -0000

Author: piso
Date: Mon Jan  5 14:27:04 2009
New Revision: 186777
URL: http://svn.freebsd.org/changeset/base/186777

Log:
  protect code not ready yet for userland with _KERNEL.

Modified:
  user/piso/sys/netinet/libalias/alias.c

Modified: user/piso/sys/netinet/libalias/alias.c
==============================================================================
--- user/piso/sys/netinet/libalias/alias.c	Mon Jan  5 14:21:49 2009	(r186776)
+++ user/piso/sys/netinet/libalias/alias.c	Mon Jan  5 14:27:04 2009	(r186777)
@@ -111,13 +111,6 @@ __FBSDID("$FreeBSD$");
     See HISTORY file for additional revisions.
 */
 
-/**
- * Modifications to add sctp functionality by David A. Hayes
- *	$Id: alias.c 122 2008-06-25 06:50:47Z dhayes $ 
- * All are inclosed in #ifdef _ALIAS_SCTP
- * 
- */
-
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -144,17 +137,11 @@ __FBSDID("$FreeBSD$");
 #include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
-#ifdef _ALIAS_SCTP
-#include <netinet/libalias/alias_sctp.h>
-#endif
 #else
 #include <err.h>
 #include "alias.h"
 #include "alias_local.h"
 #include "alias_mod.h"
-#ifdef _ALIAS_SCTP
-#include "alias_sctp.h"
-#endif
 #endif
 
 /* 
@@ -1360,7 +1347,7 @@ LibAliasInLocked(struct libalias *la, ch
 		case IPPROTO_TCP:
 			iresult = TcpAliasIn(la, pip);
 			break;
-#ifdef _ALIAS_SCTP
+#ifdef _KERNEL
 		case IPPROTO_SCTP:
 		  iresult = SctpAlias(la, pip, SN_TO_LOCAL);
 			break;
@@ -1510,7 +1497,7 @@ LibAliasOutLocked(struct libalias *la, c
 		case IPPROTO_TCP:
 			iresult = TcpAliasOut(la, pip, maxpacketsize, create);
 			break;
- #ifdef _ALIAS_SCTP
+#ifdef _KERNEL
 		case IPPROTO_SCTP:
 		  iresult = SctpAlias(la, pip, SN_TO_GLOBAL);
 			break;