Allowed 127.0.0.1 to be in RESERVED_IPS

This commit is contained in:
ktsaou 2005-06-02 15:48:52 +00:00
parent 42e3bd81bf
commit d48d627a63
2 changed files with 13 additions and 9 deletions

@ -10,7 +10,7 @@
#
# config: /etc/firehol/firehol.conf
#
# $Id: firehol.sh,v 1.234 2005/05/08 23:27:22 ktsaou Exp $
# $Id: firehol.sh,v 1.235 2005/06/02 15:48:52 ktsaou Exp $
#
# Make sure only root can run us.
@ -171,7 +171,7 @@ ${RENICE_CMD} 10 $$ >/dev/null 2>/dev/null
# Find our minor version
firehol_minor_version() {
${CAT_CMD} <<"EOF" | ${CUT_CMD} -d ' ' -f 3 | ${CUT_CMD} -d '.' -f 2
$Id: firehol.sh,v 1.234 2005/05/08 23:27:22 ktsaou Exp $
$Id: firehol.sh,v 1.235 2005/06/02 15:48:52 ktsaou Exp $
EOF
}
@ -318,7 +318,7 @@ fi
# Optimized (CIDR) by Marc 'HE' Brockschmidt <marc@marcbrockschmidt.de>
# Further optimized and reduced by http://www.vergenet.net/linux/aggregate/
# The supplied get-iana.sh uses 'aggregate-flim' if it finds it in the path.
RESERVED_IPS="0.0.0.0/7 2.0.0.0/8 5.0.0.0/8 7.0.0.0/8 23.0.0.0/8 27.0.0.0/8 31.0.0.0/8 36.0.0.0/7 39.0.0.0/8 42.0.0.0/8 74.0.0.0/7 76.0.0.0/6 89.0.0.0/8 90.0.0.0/7 92.0.0.0/6 96.0.0.0/4 112.0.0.0/5 120.0.0.0/6 173.0.0.0/8 174.0.0.0/7 176.0.0.0/5 184.0.0.0/6 189.0.0.0/8 190.0.0.0/8 197.0.0.0/8 223.0.0.0/8 240.0.0.0/4 "
RESERVED_IPS="0.0.0.0/7 2.0.0.0/8 5.0.0.0/8 7.0.0.0/8 23.0.0.0/8 27.0.0.0/8 31.0.0.0/8 36.0.0.0/7 39.0.0.0/8 42.0.0.0/8 74.0.0.0/7 76.0.0.0/6 89.0.0.0/8 90.0.0.0/7 92.0.0.0/6 96.0.0.0/4 112.0.0.0/5 120.0.0.0/6 127.0.0.0/8 173.0.0.0/8 174.0.0.0/7 176.0.0.0/5 184.0.0.0/6 189.0.0.0/8 190.0.0.0/8 197.0.0.0/8 223.0.0.0/8 240.0.0.0/4 "
# Private IPv4 address space
# Suggested by Fco.Felix Belmonte <ffelix@gescosoft.com>
@ -5279,7 +5279,7 @@ case "${arg}" in
else
${CAT_CMD} <<EOF
$Id: firehol.sh,v 1.234 2005/05/08 23:27:22 ktsaou Exp $
$Id: firehol.sh,v 1.235 2005/06/02 15:48:52 ktsaou Exp $
(C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
FireHOL is distributed under GPL.
@ -5465,7 +5465,7 @@ then
${CAT_CMD} <<EOF
$Id: firehol.sh,v 1.234 2005/05/08 23:27:22 ktsaou Exp $
$Id: firehol.sh,v 1.235 2005/06/02 15:48:52 ktsaou Exp $
(C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
FireHOL is distributed under GPL.
Home Page: http://firehol.sourceforge.net
@ -5766,7 +5766,7 @@ then
"${CAT_CMD}" >&2 <<EOF
$Id: firehol.sh,v 1.234 2005/05/08 23:27:22 ktsaou Exp $
$Id: firehol.sh,v 1.235 2005/06/02 15:48:52 ktsaou Exp $
(C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
FireHOL is distributed under GPL.
Home Page: http://firehol.sourceforge.net
@ -5849,7 +5849,7 @@ EOF
echo "# "
${CAT_CMD} <<EOF
# $Id: firehol.sh,v 1.234 2005/05/08 23:27:22 ktsaou Exp $
# $Id: firehol.sh,v 1.235 2005/06/02 15:48:52 ktsaou Exp $
# (C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
# FireHOL is distributed under GPL.
# Home Page: http://firehol.sourceforge.net

@ -1,8 +1,11 @@
#!/bin/bash
# $Id: get-iana.sh,v 1.7 2005/05/08 23:27:23 ktsaou Exp $
# $Id: get-iana.sh,v 1.8 2005/06/02 15:48:52 ktsaou Exp $
#
# $Log: get-iana.sh,v $
# Revision 1.8 2005/06/02 15:48:52 ktsaou
# Allowed 127.0.0.1 to be in RESERVED_IPS
#
# Revision 1.7 2005/05/08 23:27:23 ktsaou
# Updated RESERVED_IPS to current IANA reservations.
#
@ -57,7 +60,8 @@ wget -O - --proxy=off "${IPV4_ADDRESS_SPACE_URL}" 2>>$LOG |\
x=$first
while [ ! $x -gt $last ]
do
test $x -ne 127 && echo "$x.0.0.0/$net"
# test $x -ne 127 && echo "$x.0.0.0/$net"
echo "$x.0.0.0/$net"
x=$[x + 1]
done
done