~mdw
/
firewall
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into emergency
[firewall]
/
functions.m4
diff --git
a/functions.m4
b/functions.m4
index
d059de6
..
b78dcbe
100644
(file)
--- a/
functions.m4
+++ b/
functions.m4
@@
-289,11
+289,12
@@
allowservices () {
## Add rules to CHAIN to allow NTP with NTPSERVERs.
ntpclient () {
set -e
## Add rules to CHAIN to allow NTP with NTPSERVERs.
ntpclient () {
set -e
- chain=$1; shift
- for ntp; do
- run iptables -A $chain -s $ntp -j ACCEPT \
- -p udp --source-port 123 --destination-port 123
- done
+ ntpchain=$1; shift
+
+ clearchain ntp-servers
+ for ntp; do run iptables -A ntp-servers -j ACCEPT -s $ntp; done
+ run iptables -A $ntpchain -j ntp-servers \
+ -p udp --source-port 123 --destination-port 123
}
## dnsresolver CHAIN
}
## dnsresolver CHAIN
@@
-497,7
+498,7
@@
host () {
for n in $nn; do
addr=${n%/*}
base=${addr%::*}
for n in $nn; do
addr=${n%/*}
base=${addr%::*}
- case $a
in ::*) aa=$addr$a ;; *) aa=$a
;; esac
+ case $a
6 in ::*) aa=$base$a6 ;; *) aa=$a6
;; esac
eval host_inet6_$name=$aa
done
eval host_inet6_$name=$aa
done