a69212da23
- Make merge-hook usable - Change ND_RA_FLAG_HOME_AGENT to ND_RA_FLAG_HA instead of deletion - Bump PORTREVISION PR: ports/161172 Submitted by: Mikhail T. <m.tsatsenko@gmail.com>
28 lines
902 B
Text
28 lines
902 B
Text
--- rdnssd/merge-hook.in.orig 2011-09-30 17:29:15.000000000 +0200
|
|
+++ rdnssd/merge-hook.in 2011-09-30 17:29:53.000000000 +0200
|
|
@@ -21,7 +21,7 @@
|
|
|
|
set -e
|
|
|
|
-PATH=/sbin:/bin
|
|
+PATH=/sbin:/bin:/usr/bin
|
|
|
|
# Max number of nameserver options taken into account. Should be as
|
|
# defined in <resolv.h>
|
|
@@ -33,14 +33,14 @@
|
|
# will limit the IPv6 entries it adds to $RDNSS_LIMIT only.
|
|
RDNSS_LIMIT=$(($MAXNS - 1))
|
|
|
|
-sysconfdir='@SYSCONFDIR@'
|
|
+sysconfdir='/etc'
|
|
localstatedir='@LOCALSTATEDIR@'
|
|
resolvconf="$sysconfdir/resolv.conf"
|
|
myresolvconf="$localstatedir/run/rdnssd/resolv.conf"
|
|
|
|
# These should be POSIX-compliant BREs
|
|
RE_NSV4='^nameserver *\([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\} *$'
|
|
-RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{,1\} *$'
|
|
+RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{0,1\} *$'
|
|
|
|
# Count how many IPv6 nameservers we can fit
|
|
|