projects
/
spamassassin-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- upgrade za Lenny
[spamassassin-cn.git]
/
debian
/
postinst
diff --git
a/debian/postinst
b/debian/postinst
index
99933b2
..
ff854eb
100755
(executable)
--- a/
debian/postinst
+++ b/
debian/postinst
@@
-204,19
+204,31
@@
if [ -f $examdir/local.cf ]; then
netaddr="$RET"
# ... get already configured trusted networks
trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
netaddr="$RET"
# ... get already configured trusted networks
trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
- $confdir/local.cf.$$)
+ $confdir/local.cf.$$ | sed -e 's/,/ /g')
# ... merge with local networks configured on eth interfaces
for i in $netaddr; do
if ! echo "$trusted_networks" | grep -q "$i"; then
trusted_networks="$trusted_networks $i"
fi
done
# ... merge with local networks configured on eth interfaces
for i in $netaddr; do
if ! echo "$trusted_networks" | grep -q "$i"; then
trusted_networks="$trusted_networks $i"
fi
done
+ # ... merge with Postfix ranges
+ if [ -x /usr/sbin/postconf ]; then
+ for i in $(postconf -h mynetworks | sed -e 's/,/ /g'); do
+ if ! echo "$trusted_networks" | grep -q "$i"; then
+ trusted_networks="$trusted_networks $i"
+ fi
+ done
+ fi
# ... strip 127/8 range
for i in $trusted_networks; do
# ... strip 127/8 range
for i in $trusted_networks; do
- if ! echo "$i" | grep -q "127.0.0.0/8"; then
+ if ! echo "$i" | egrep -q \
+ "127.0.0.0/8|\[::1\]/128|\[::ffff:127.0.0.0\]/104"; then
trusted_networks_clean="$trusted_networks_clean $i"
fi
done
trusted_networks_clean="$trusted_networks_clean $i"
fi
done
+ # ... strip left and right blanks from final string
+ trusted_networks_clean=$(echo "$trusted_networks_clean" \
+ | sed 's/^[ \t]*//;s/[ \t]*$//')
# ... and replace if non-zero
if [ ! -z "$trusted_networks_clean" ]; then
trusted_networks=$trusted_networks_clean
# ... and replace if non-zero
if [ ! -z "$trusted_networks_clean" ]; then
trusted_networks=$trusted_networks_clean