summaryrefslogtreecommitdiffstats
path: root/sys/conf/options
diff options
context:
space:
mode:
authorjulian <julian@FreeBSD.org>1998-06-05 22:40:01 +0000
committerjulian <julian@FreeBSD.org>1998-06-05 22:40:01 +0000
commitf7a6c6446198ae23d997bc4486e475fc29eac0a9 (patch)
tree12135a908d89d9059a51c47f514b68038409b3e7 /sys/conf/options
parent3baa0462547cb98ece8c9d8ac604a70290e7d83f (diff)
downloadFreeBSD-src-f7a6c6446198ae23d997bc4486e475fc29eac0a9.zip
FreeBSD-src-f7a6c6446198ae23d997bc4486e475fc29eac0a9.tar.gz
Reverse the default sense of the IPFW/DIVERT reinjection code
so that the new behaviour is now default. Solves the "infinite loop in diversion" problem when more than one diversion is active. Man page changes follow. The new code is in -stable as the NON default option.
Diffstat (limited to 'sys/conf/options')
-rw-r--r--sys/conf/options4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 4293ef4..eae6959 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $Id: options,v 1.74 1998/05/24 01:29:52 jkh Exp $
+# $Id: options,v 1.75 1998/05/25 10:37:40 julian Exp $
#
# On the handling of kernel options
#
@@ -174,7 +174,7 @@ IPFIREWALL_VERBOSE opt_ipfw.h
IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h
IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h
#temp option to change ipfw/divert semantics. Should become standard.
-IPFW_DIVERT_RESTART opt_ipfw.h
+IPFW_DIVERT_OLDRESTART opt_ipfw.h
IPX opt_ipx.h
IPXIP opt_ipx.h
IPTUNNEL opt_ipx.h
OpenPOWER on IntegriCloud