summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2004-06-21 17:02:53 +0000
committermarkus <markus@openbsd.org>2004-06-21 17:02:53 +0000
commitd01f1793f19ca38f3a892314dd02b11d68a8f50d (patch)
tree7b177e0c91b9686198288a2e4a0e6b16fdc20a66
parentpropagate CPP here as well (diff)
downloadwireguard-openbsd-d01f1793f19ca38f3a892314dd02b11d68a8f50d.tar.xz
wireguard-openbsd-d01f1793f19ca38f3a892314dd02b11d68a8f50d.zip
undo double-patch; Dries Schellekens
-rw-r--r--sbin/isakmpd/features/nat_traversal29
1 files changed, 1 insertions, 28 deletions
diff --git a/sbin/isakmpd/features/nat_traversal b/sbin/isakmpd/features/nat_traversal
index 91136cc223f..590b4bfc908 100644
--- a/sbin/isakmpd/features/nat_traversal
+++ b/sbin/isakmpd/features/nat_traversal
@@ -1,31 +1,4 @@
-# $OpenBSD: nat_traversal,v 1.1 2004/06/20 15:24:05 ho Exp $
-
-#
-# Copyright (c) 2004 Håkan Olsson. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-NAT_TRAVERSAL= nat_traversal.c udp_encap.c
-# $OpenBSD: nat_traversal,v 1.1 2004/06/20 15:24:05 ho Exp $
+# $OpenBSD: nat_traversal,v 1.2 2004/06/21 17:02:53 markus Exp $
#
# Copyright (c) 2004 Håkan Olsson. All rights reserved.