CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: roy
Date: Sun Dec 27 18:26:50 UTC 2020
Modified Files:
src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in
resolvconf.in
Log Message:
Sync with openresolv-3.12.0
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/openresolv/dist/resolvconf.8.in
cvs rdiff -u -r1.20 -r1.21 \
src/external/bsd/openresolv/dist/resolvconf.conf.5.in
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/openresolv/dist/resolvconf.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/resolvconf.8.in
diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.10 src/external/bsd/openresolv/dist/resolvconf.8.in:1.11
--- src/external/bsd/openresolv/dist/resolvconf.8.in:1.10 Mon Jan 27 21:13:05 2020
+++ src/external/bsd/openresolv/dist/resolvconf.8.in Sun Dec 27 18:26:50 2020
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd November 29, 2016
+.Dd December 23, 2016
.Dt RESOLVCONF 8
.Os
.Sh NAME
@@ -38,6 +38,10 @@
.Fl a Ar interface Ns Op Ar .protocol
.No < Ns Pa file
.Nm
+.Fl C Ar pattern
+.Nm
+.Fl c Ar pattern
+.Nm
.Op Fl f
.Fl d Ar interface Ns Op Ar .protocol
.Nm
@@ -126,6 +130,15 @@ file(s) for all the
.Ar protocols
on the
.Ar interface .
+For systems that support the concept of persisting configuration when
+the carrier goes down, then it should instead call
+.Nm
+with
+.Fl C Ar interface.*
+arguments to deprecate the matching interfaces and
+.Fl c Ar interface.*
+to activate the matching interfaces when the carrier comes up.
+This only affects the order in which interfaces are processed.
.Pp
Here are some options for the above commands:-
.Bl -tag -width pattern_opt
Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in
diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.20 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.21
--- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.20 Mon Jan 27 21:13:05 2020
+++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Sun Dec 27 18:26:50 2020
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd September 8, 2019
+.Dd October 1, 2020
.Dt RESOLVCONF.CONF 5
.Os
.Sh NAME
@@ -220,7 +220,7 @@ openresolv ships with subscribers for th
and
.Xr unbound 8 .
Each subscriber can create configuration files which should be included in
-in the subscribers main configuration file.
+the subscribers main configuration file.
.Pp
To disable a subscriber, simply set it's name to NO.
For example, to disable the libc subscriber you would set:
Index: src/external/bsd/openresolv/dist/resolvconf.in
diff -u src/external/bsd/openresolv/dist/resolvconf.in:1.8 src/external/bsd/openresolv/dist/resolvconf.in:1.9
--- src/external/bsd/openresolv/dist/resolvconf.in:1.8 Wed Jul 22 13:19:17 2020
+++ src/external/bsd/openresolv/dist/resolvconf.in Sun Dec 27 18:26:50 2020
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
RESOLVCONF="$0"
-OPENRESOLV_VERSION="3.11.0"
+OPENRESOLV_VERSION="3.12.0"
SYSCONFDIR=@SYSCONFDIR@
LIBEXECDIR=@LIBEXECDIR@
VARDIR=@VARDIR@
@@ -64,6 +64,7 @@ IFACEDIR="$VARDIR/interfaces"
METRICDIR="$VARDIR/metrics"
PRIVATEDIR="$VARDIR/private"
EXCLUSIVEDIR="$VARDIR/exclusive"
+DEPRECATEDDIR="$VARDIR/deprecated"
LOCKDIR="$VARDIR/lock"
_PWD="$PWD"
@@ -88,6 +89,8 @@ usage()
Commands:
-a \$INTERFACEAdd DNS information to the specified interface
(DNS supplied via stdin in resolv.conf format)
+ -C \$PATTERN Deprecate DNS information for matched interfaces
+ -c \$PATTERN Configure DNS information for matched interfaces
-d \$INTERFACEDelete DNS information from the specified interface
-h Show this help cruft
-i [\$PATTERN]Show interfaces that have supplied DNS information
@@ -275,19 +278,14 @@ dirname()
config_mkdirs()
{
- e=0
for f; do
[ -n "$f" ] || continue
d="$(dirname "$f")"
if [ ! -d "$d" ]; then
- if type install >/dev/null 2>&1; then
-install -d "$d" || e=$?
- else
-mkdir "$d" || e=$?
- fi
+ mkdir -p "$d" || return $?
fi
done
- return $e
+ return 0
}
# With the advent of alternative init systems, it's possible to have
@@ -412,6 +410,22 @@ echo_resolv()
IFS="$OIFS"
}
+deprecated_interface()
+{
+ [ -d "$DEPRECATEDDIR" ] || return 1
+
+ cd "$DEPRECATEDDIR"
+ for da; do
+ for daf in *; do
+ [ -f "$daf" ] || continue
+ case "$da" in
+ $daf) return 0;;
+ esac
+ done
+ done
+ return 1
+}
+
list_resolv()
{
[ -d "$IFACEDIR" ] || return 0
@@ -453,12 +467,14 @@ list_resolv()
$force || report=true
elif ! $excl; then
cd "$IFACEDIR"
+
for i in $interface_order; do
[ -f "$i" ] && list="$list $i"
for ii
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Wed Jul 22 13:19:17 UTC 2020 Modified Files: src/external/bsd/openresolv/dist: resolvconf.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openresolv/dist/resolvconf.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.in diff -u src/external/bsd/openresolv/dist/resolvconf.in:1.7 src/external/bsd/openresolv/dist/resolvconf.in:1.8 --- src/external/bsd/openresolv/dist/resolvconf.in:1.7 Mon Jan 27 21:13:05 2020 +++ src/external/bsd/openresolv/dist/resolvconf.in Wed Jul 22 13:19:17 2020 @@ -25,7 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. RESOLVCONF="$0" -OPENRESOLV_VERSION="3.10.0" +OPENRESOLV_VERSION="3.11.0" SYSCONFDIR=@SYSCONFDIR@ LIBEXECDIR=@LIBEXECDIR@ VARDIR=@VARDIR@
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Mon Jan 27 21:13:05 UTC 2020 Modified Files: src/external/bsd/openresolv/dist: dnsmasq.in libc.in named.in pdnsd.in resolvconf.8.in resolvconf.conf.5.in resolvconf.in unbound.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openresolv/dist/dnsmasq.in cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openresolv/dist/libc.in cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openresolv/dist/named.in \ src/external/bsd/openresolv/dist/pdnsd.in cvs rdiff -u -r1.9 -r1.10 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.19 -r1.20 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openresolv/dist/resolvconf.in cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openresolv/dist/unbound.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/dnsmasq.in diff -u src/external/bsd/openresolv/dist/dnsmasq.in:1.5 src/external/bsd/openresolv/dist/dnsmasq.in:1.6 --- src/external/bsd/openresolv/dist/dnsmasq.in:1.5 Sun Sep 8 20:48:50 2019 +++ src/external/bsd/openresolv/dist/dnsmasq.in Mon Jan 27 21:13:05 2020 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2019 Roy Marples +# Copyright (c) 2007-2020 Roy Marples # All rights reserved # dnsmasq subscriber for resolvconf Index: src/external/bsd/openresolv/dist/libc.in diff -u src/external/bsd/openresolv/dist/libc.in:1.4 src/external/bsd/openresolv/dist/libc.in:1.5 --- src/external/bsd/openresolv/dist/libc.in:1.4 Wed Jul 17 18:31:43 2019 +++ src/external/bsd/openresolv/dist/libc.in Mon Jan 27 21:13:05 2020 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2019 Roy Marples +# Copyright (c) 2007-2020 Roy Marples # All rights reserved # libc subscriber for resolvconf Index: src/external/bsd/openresolv/dist/named.in diff -u src/external/bsd/openresolv/dist/named.in:1.3 src/external/bsd/openresolv/dist/named.in:1.4 --- src/external/bsd/openresolv/dist/named.in:1.3 Tue Oct 9 01:28:35 2018 +++ src/external/bsd/openresolv/dist/named.in Mon Jan 27 21:13:05 2020 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2016 Roy Marples +# Copyright (c) 2007-2020 Roy Marples # All rights reserved # named subscriber for resolvconf Index: src/external/bsd/openresolv/dist/pdnsd.in diff -u src/external/bsd/openresolv/dist/pdnsd.in:1.3 src/external/bsd/openresolv/dist/pdnsd.in:1.4 --- src/external/bsd/openresolv/dist/pdnsd.in:1.3 Wed Jul 17 18:31:43 2019 +++ src/external/bsd/openresolv/dist/pdnsd.in Mon Jan 27 21:13:05 2020 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2010-2018 Roy Marples +# Copyright (c) 2010-2020 Roy Marples # All rights reserved # pdnsd subscriber for resolvconf Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.9 src/external/bsd/openresolv/dist/resolvconf.8.in:1.10 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.9 Fri Dec 30 19:43:36 2016 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Mon Jan 27 21:13:05 2020 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007-2016 Roy Marples +.\" Copyright (c) 2007-2020 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.19 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.20 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.19 Sun Sep 8 20:48:50 2019 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Jan 27 21:13:05 2020 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2016 Roy Marples +.\" Copyright (c) 2009-2020 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -61,6 +61,10 @@ Set to NO to disable .Nm resolvconf from running any subscribers. Defaults to YES. +.It Sy allow_interfaces +If set, only these interfaces will be processed. +.It Sy deny_interfaces +If set, these interfaces will not be processed. .It Sy interface_order These interfaces will always be processed first. If unset, defaults to the following:- @@ -71,7 +75,7 @@ lo lo[0-9]* These interfaces will be processed next, unless they have a metric. If unset, defaults to the following:- .Bd -compact -literal -offset indent -tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]* +tap[0-9]* tun[0-9]* vpn vpn[0-9]* wg[0-9]* ppp[0-9]* ippp[0-9]* .Ed .It Sy inclusive_interfaces Ignore any exclusive marking for these interfaces. @@ -212,7 +216,7 @@ openresolv ships with subscribers for th .Xr dnsmasq 8 , .Xr named 8 , .Xr pdnsd 8 , -.Xr pdns_recursor 8 , +.Xr pdns_recursor 1 , and .Xr unbound 8 . Each subscriber can create configuration files which should be included in Index: src/external/bsd/openresolv/dist/resolvconf.in diff -u sr
CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: kre
Date: Tue Oct 9 02:53:11 UTC 2018
Modified Files:
src/external/bsd/openresolv/dist: dnsmasq.in
Log Message:
Fix stupid edit botch in previous, pointed out by leot@ (thanks).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openresolv/dist/dnsmasq.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/dnsmasq.in
diff -u src/external/bsd/openresolv/dist/dnsmasq.in:1.3 src/external/bsd/openresolv/dist/dnsmasq.in:1.4
--- src/external/bsd/openresolv/dist/dnsmasq.in:1.3 Tue Oct 9 01:28:35 2018
+++ src/external/bsd/openresolv/dist/dnsmasq.in Tue Oct 9 02:53:11 2018
@@ -184,7 +184,7 @@ if $changed; then
eval $dnsmasq_restart
elif [ -n "$RESTARTCMD" ]; then
set -- ${dnsmasq_service}
- eval "$RESTARTCMD""
+ eval "$RESTARTCMD"
else
@SBINDIR@/resolvconf -r ${dnsmasq_service}
fi
CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: kre
Date: Tue Oct 9 01:28:35 UTC 2018
Modified Files:
src/external/bsd/openresolv/dist: dnsmasq.in libc.in named.in
unbound.in
Log Message:
PR port-evbarm/53661
Always quote RESTARTCMD when eval'ing it. Whatever script does it...
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openresolv/dist/dnsmasq.in \
src/external/bsd/openresolv/dist/libc.in \
src/external/bsd/openresolv/dist/named.in
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/openresolv/dist/unbound.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/dnsmasq.in
diff -u src/external/bsd/openresolv/dist/dnsmasq.in:1.2 src/external/bsd/openresolv/dist/dnsmasq.in:1.3
--- src/external/bsd/openresolv/dist/dnsmasq.in:1.2 Mon Sep 24 21:58:11 2018
+++ src/external/bsd/openresolv/dist/dnsmasq.in Tue Oct 9 01:28:35 2018
@@ -184,7 +184,7 @@ if $changed; then
eval $dnsmasq_restart
elif [ -n "$RESTARTCMD" ]; then
set -- ${dnsmasq_service}
- eval $RESTARTCMD
+ eval "$RESTARTCMD""
else
@SBINDIR@/resolvconf -r ${dnsmasq_service}
fi
Index: src/external/bsd/openresolv/dist/libc.in
diff -u src/external/bsd/openresolv/dist/libc.in:1.2 src/external/bsd/openresolv/dist/libc.in:1.3
--- src/external/bsd/openresolv/dist/libc.in:1.2 Mon Sep 24 21:58:11 2018
+++ src/external/bsd/openresolv/dist/libc.in Tue Oct 9 01:28:35 2018
@@ -234,7 +234,7 @@ if [ -n "$libc_restart" ]; then
eval $libc_restart
elif [ -n "$RESTARTCMD" ]; then
set -- ${libc_service}
- eval $RESTARTCMD
+ eval "$RESTARTCMD"
else
@SBINDIR@/resolvconf -r ${libc_service}
fi
Index: src/external/bsd/openresolv/dist/named.in
diff -u src/external/bsd/openresolv/dist/named.in:1.2 src/external/bsd/openresolv/dist/named.in:1.3
--- src/external/bsd/openresolv/dist/named.in:1.2 Mon Sep 24 21:58:11 2018
+++ src/external/bsd/openresolv/dist/named.in Tue Oct 9 01:28:35 2018
@@ -111,7 +111,7 @@ if $changed; then
eval $named_restart
elif [ -n "$RESTARTCMD" ]; then
set -- ${named_service}
- eval $RESTARTCMD
+ eval "$RESTARTCMD"
else
@SBINDIR@/resolvconf -r ${named_service}
fi
Index: src/external/bsd/openresolv/dist/unbound.in
diff -u src/external/bsd/openresolv/dist/unbound.in:1.1.1.8 src/external/bsd/openresolv/dist/unbound.in:1.2
--- src/external/bsd/openresolv/dist/unbound.in:1.1.1.8 Mon Apr 11 10:40:22 2016
+++ src/external/bsd/openresolv/dist/unbound.in Tue Oct 9 01:28:35 2018
@@ -76,7 +76,7 @@ restart_unbound()
eval $unbound_restart
elif [ -n "$RESTARTCMD" ]; then
set -- ${unbound_service}
- eval $RESTARTCMD
+ eval "$RESTARTCMD"
else
@SBINDIR@/resolvconf -r ${unbound_service}
fi
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: kre Date: Mon Oct 8 14:09:38 UTC 2018 Modified Files: src/external/bsd/openresolv/dist: resolvconf.in Log Message: PR port-evbarm/53661 (which has nothing particular to do with port-evbarm) When eval'ing RESTARTCMD don't field split it, only to join the words again (by eval) - that converts newlines and tabs to spaces, and the first of those causes sh syntax errors with the way that the various RESTARTCMDs are now written (but it was always dangerous, as filename expansions could also have happened, which is not wanted, I believe.) Also correct a translation error. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openresolv/dist/resolvconf.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.in diff -u src/external/bsd/openresolv/dist/resolvconf.in:1.3 src/external/bsd/openresolv/dist/resolvconf.in:1.4 --- src/external/bsd/openresolv/dist/resolvconf.in:1.3 Tue Sep 25 05:57:46 2018 +++ src/external/bsd/openresolv/dist/resolvconf.in Mon Oct 8 14:09:38 2018 @@ -329,11 +329,11 @@ detect_init() fi' elif [ -x /usr/sbin/service ]; then # Could be FreeBSD - RESTARTCMD=' - if /usr/sbin/service $1 $status >/dev/null 2>&1 + RESTARTCMD=" + if /usr/sbin/service \$1 $status >/dev/null 2>&1 then -/usr/sbin/service $1 restart - fi' +/usr/sbin/service \$1 restart + fi" elif [ -x /bin/sv ]; then RESTARTCMD='/bin/sv status $1 >/dev/null 2>&1 && /bin/sv try-restart $1' @@ -697,7 +697,7 @@ if [ "$cmd" = r ] || [ "$cmd" = R ]; the detect_init || exit 1 if [ "$cmd" = r ]; then set -- $args - eval $RESTARTCMD + eval "$RESTARTCMD" else echo "$RESTARTCMD" fi
CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: ryoon
Date: Tue Sep 25 05:57:46 UTC 2018
Modified Files:
src/external/bsd/openresolv/dist: resolvconf.in
Log Message:
Close double quotation mark
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openresolv/dist/resolvconf.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/resolvconf.in
diff -u src/external/bsd/openresolv/dist/resolvconf.in:1.2 src/external/bsd/openresolv/dist/resolvconf.in:1.3
--- src/external/bsd/openresolv/dist/resolvconf.in:1.2 Mon Sep 24 21:58:11 2018
+++ src/external/bsd/openresolv/dist/resolvconf.in Tue Sep 25 05:57:46 2018
@@ -603,7 +603,7 @@ make_vars()
list_resolv -i "$@" >/dev/null || IF_EXCLUSIVE=0
eval "$(list_resolv -l "$@" | replace | parse_resolv)"
fi
- if [ -n "${name_servers_append}${search_domains_append} ]; then
+ if [ -n "${name_servers_append}${search_domains_append}" ]; then
eval "$(echo_append | parse_resolv)"
fi
CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: kre
Date: Mon Sep 24 21:58:11 UTC 2018
Modified Files:
src/external/bsd/openresolv/dist: dnsmasq.in libc.in named.in pdnsd.in
resolvconf.in
Log Message:
Resolvconf is (can be) used as part of network config during
system installation, so also must confine itself to POSIX specified
test ('[') usage. Pointed out by roy@ - thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/openresolv/dist/dnsmasq.in \
src/external/bsd/openresolv/dist/libc.in
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/openresolv/dist/named.in
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/openresolv/dist/pdnsd.in
cvs rdiff -u -r1.1.1.14 -r1.2 src/external/bsd/openresolv/dist/resolvconf.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/dnsmasq.in
diff -u src/external/bsd/openresolv/dist/dnsmasq.in:1.1.1.11 src/external/bsd/openresolv/dist/dnsmasq.in:1.2
--- src/external/bsd/openresolv/dist/dnsmasq.in:1.1.1.11 Mon Apr 11 10:40:22 2016
+++ src/external/bsd/openresolv/dist/dnsmasq.in Mon Sep 24 21:58:11 2018
@@ -28,7 +28,7 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1
-[ -z "$dnsmasq_conf" -a -z "$dnsmasq_resolv" ] && exit 0
+[ -z "${dnsmasq_conf}${dnsmasq_resolv}" ] && exit 0
[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
NL="
"
@@ -98,7 +98,7 @@ for d in $DOMAINS; do
empty=false i=0
IFS=:
set -- $n
-while [ -n "$1" -o -n "$2" ]; do
+while [ -n "$1" ] || [ -n "$2" ]; do
addr="$1"
shift
if [ -z "$addr" ]; then
Index: src/external/bsd/openresolv/dist/libc.in
diff -u src/external/bsd/openresolv/dist/libc.in:1.1.1.11 src/external/bsd/openresolv/dist/libc.in:1.2
--- src/external/bsd/openresolv/dist/libc.in:1.1.1.11 Fri Dec 30 19:42:05 2016
+++ src/external/bsd/openresolv/dist/libc.in Mon Sep 24 21:58:11 2018
@@ -98,10 +98,12 @@ fi
: ${resolv_conf:=/etc/resolv.conf}
: ${libc_service:=nscd}
: ${list_resolv:=@SBINDIR@/resolvconf -l}
-if [ "${resolv_conf_head-x}" = x -a -f "$SYSCONFDIR"/resolv.conf.head ]; then
+if [ "${resolv_conf_head-x}" = x ] && [ -f "$SYSCONFDIR"/resolv.conf.head ]
+then
resolv_conf_head="$(cat "${SYSCONFDIR}"/resolv.conf.head)"
fi
-if [ "${resolv_conf_tail-x}" = x -a -f "$SYSCONFDIR"/resolv.conf.tail ]; then
+if [ "${resolv_conf_tail-x}" = x ] && [ -f "$SYSCONFDIR"/resolv.conf.tail ]
+then
resolv_conf_tail="$(cat "$SYSCONFDIR"/resolv.conf.tail)"
fi
@@ -126,7 +128,7 @@ case "${resolv_conf_passthrough:-NO}" in
backup=false
newest=
for conf in "$IFACEDIR"/*; do
- if [ -z "$newest" -o "$conf" -nt "$newest" ]; then
+ if [ -z "$newest" ] || [ "$conf" -nt "$newest" ]; then
newest="$conf"
fi
done
@@ -178,7 +180,7 @@ case "${resolv_conf_passthrough:-NO}" in
fi
[ -n "$domain" ] && newconf="${newconf}domain $domain$NL"
- if [ -n "$newsearch" -a "$newsearch" != "$domain" ]; then
+ if [ -n "$newsearch" ] && [ "$newsearch" != "$domain" ]; then
newconf="${newconf}search $newsearch$NL"
fi
for n in $newns; do
Index: src/external/bsd/openresolv/dist/named.in
diff -u src/external/bsd/openresolv/dist/named.in:1.1.1.7 src/external/bsd/openresolv/dist/named.in:1.2
--- src/external/bsd/openresolv/dist/named.in:1.1.1.7 Mon Apr 11 10:40:22 2016
+++ src/external/bsd/openresolv/dist/named.in Mon Sep 24 21:58:11 2018
@@ -28,14 +28,14 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1
-[ -z "$named_zones" -a -z "$named_options" ] && exit 0
+[ -z "${named_zones}${named_options}" ] && exit 0
[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
NL="
"
# Platform specific kludges
-if [ -z "$named_service" -a -z "$named_restart" -a \
- -d "$RCDIR" -a ! -x "$RCDIR"/named ]
+if [ -z "${named_service}${named_restart}" ] &&
+ [ -d "$RCDIR" ] && ! [ -x "$RCDIR"/named ]
then
if [ -x "$RCDIR"/bind9 ]; then
# Debian and derivatives
Index: src/external/bsd/openresolv/dist/pdnsd.in
diff -u src/external/bsd/openresolv/dist/pdnsd.in:1.1.1.4 src/external/bsd/openresolv/dist/pdnsd.in:1.2
--- src/external/bsd/openresolv/dist/pdnsd.in:1.1.1.4 Fri Jul 12 16:50:27 2013
+++ src/external/bsd/openresolv/dist/pdnsd.in Mon Sep 24 21:58:11 2018
@@ -28,7 +28,7 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1
-[ -z "$pdnsd_conf" -a -z "$pdnsd_resolv" ] && exit 0
+[ -z "${pdnsd_conf}${pdnsd_resolv}" ] && exit 0
[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
NL="
"
Index: src/external/bsd/openresolv/dist/resolvconf.in
diff -u src/external/bsd/openresolv/dist/resolvconf.in:1.1.1.14 src/external/bsd/openresolv/dist/resolvconf.in:1.2
--- src/external/bsd/openresolv/dist/resolvconf.in:1.1.1.14 Fri Dec 30 19:42:05 2016
+++ src/external/bsd/openresolv/dist/resolvconf.in Mon Sep 24 21:58:
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: abhinav Date: Tue Jan 31 21:25:59 UTC 2017 Modified Files: src/external/bsd/openresolv/dist: resolvconf.conf.5.in Log Message: Fix spelling of exclusive. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.17 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.18 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.17 Fri Dec 30 19:43:36 2016 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Tue Jan 31 21:25:58 2017 @@ -70,7 +70,7 @@ These interfaces will be processed next, If unset, defaults to the following:- .D1 tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]* .It Sy inclusive_interfaces -Ignore any exlcusive marking for these interfaces. +Ignore any exclusive marking for these interfaces. This is handy when 3rd party integrations force the .Nm resolvconf -x option and you want to disable it easily.
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Fri Dec 30 19:43:36 UTC 2016 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.16 -r1.17 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.8 src/external/bsd/openresolv/dist/resolvconf.8.in:1.9 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.8 Thu Apr 28 08:16:09 2016 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Fri Dec 30 19:43:36 2016 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 23, 2016 +.Dd November 29, 2016 .Dt RESOLVCONF 8 .Os .Sh NAME @@ -45,6 +45,8 @@ .Fl il Ar pattern .Nm .Fl u +.Nm +.Fl Fl version .Sh DESCRIPTION .Nm manages @@ -106,7 +108,7 @@ See .Xr resolvconf.conf 5 for how to configure .Nm -to use a local name server. +to use a local name server and how to remove the private marking. .Pp .Nm can mark an interfaces @@ -126,9 +128,9 @@ on the .Ar interface . .Pp Here are some options for the above commands:- -.Bl -tag -width indent +.Bl -tag -width pattern_opt .It Fl f -Ignore non existant interfaces. +Ignore non existent interfaces. Only really useful for deleting interfaces. .It Fl m Ar metric Set the metric of the interface when adding it, default of 0. @@ -146,7 +148,7 @@ as exclusive when adding, otherwise only .Pp .Nm has some more commands for general usage:- -.Bl -tag -width indent +.Bl -tag -width pattern_opt .It Fl i Ar pattern List the interfaces and protocols, optionally matching .Ar pattern , @@ -168,12 +170,15 @@ to update all its subscribers. .Nm does not update the subscribers when adding a resolv.conf that matches what it already has for that interface. +.It Fl Fl version +Echo the resolvconf version to +.Em stdout . .El .Pp .Nm also has some commands designed to be used by it's subscribers and system startup:- -.Bl -tag -width indent +.Bl -tag -width pattern_opt .It Fl I Initialise the state directory .Pa @VARDIR@ . @@ -223,7 +228,7 @@ Here are some suggested protocol tags to .Pa resolv.conf file registered on an .Ar interface Ns No :- -.Bl -tag -width indent +.Bl -tag -width pattern_opt .It dhcp Dynamic Host Configuration Protocol. Initial versions of Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.16 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.17 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.16 Thu Apr 28 08:17:04 2016 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Fri Dec 30 19:43:36 2016 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 23, 2016 +.Dd December 29, 2016 .Dt RESOLVCONF.CONF 5 .Os .Sh NAME @@ -69,6 +69,11 @@ If unset, defaults to the following:- These interfaces will be processed next, unless they have a metric. If unset, defaults to the following:- .D1 tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]* +.It Sy inclusive_interfaces +Ignore any exlcusive marking for these interfaces. +This is handy when 3rd party integrations force the +.Nm resolvconf -x +option and you want to disable it easily. .It Sy local_nameservers If unset, defaults to the following:- .D1 127.* 0.0.0.0 255.255.255.255 ::1 @@ -102,6 +107,11 @@ Requires a local nameserver other than l This is equivalent to the .Nm resolvconf -p option. +.It Sy public_interfaces +Force these interface to be public, overriding the private marking. +This is handy when 3rd party integrations force the +.Nm resolvconf -p +option and you want to disable it easily. .It Sy replace Is a space separated list of replacement keywords. The syntax is this:
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: wiz Date: Thu Apr 28 08:17:04 UTC 2016 Modified Files: src/external/bsd/openresolv/dist: resolvconf.conf.5.in Log Message: Sort SEE ALSO. New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.15 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.16 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.15 Mon Apr 11 10:41:51 2016 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Thu Apr 28 08:17:04 2016 @@ -103,7 +103,8 @@ This is equivalent to the .Nm resolvconf -p option. .It Sy replace -Is a space separated list of replacement keywords. The syntax is this: +Is a space separated list of replacement keywords. +The syntax is this: .Va $keyword Ns / Ns Va $match Ns / Ns Va $replacement .Pp Example, given this resolv.conf: @@ -307,10 +308,9 @@ Command to restart the unbound service. Location of the unbound pidfile. .El .Sh SEE ALSO +.Xr sh 1 , .Xr resolv.conf 5 , .Xr resolvconf 8 -and -.Xr sh 1 . .Sh AUTHORS .An Roy Marples Aq Mt r...@marples.name .Sh BUGS
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: wiz Date: Thu Apr 28 08:16:09 UTC 2016 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in Log Message: Fix xrefs. Sort sections. Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openresolv/dist/resolvconf.8.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.7 src/external/bsd/openresolv/dist/resolvconf.8.in:1.8 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.7 Mon Apr 11 10:41:51 2016 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Thu Apr 28 08:16:09 2016 @@ -64,7 +64,7 @@ solves this by letting the daemon send t file to .Nm via -.Xr stdin 3 +.Xr stdin 4 with the argument .Fl a Ar interface Ns Op Ar .protocol instead of the filesystem. @@ -101,7 +101,7 @@ as private. This means that the name servers listed in that .Pa resolv.conf are only used for queries against the domain/search listed in the same file. -This only works when a local resolver other than libc is installed. +This only works when a local resolver other than libc is installed. See .Xr resolvconf.conf 5 for how to configure @@ -290,16 +290,16 @@ Directory of subscribers which are run a State directory for .Nm . .El +.Sh SEE ALSO +.Xr resolver 3 , +.Xr stdin 4 , +.Xr resolv.conf 5 , +.Xr resolvconf.conf 5 .Sh HISTORY This implementation of .Nm is called openresolv and is fully command line compatible with Debian's resolvconf, as written by Thomas Hood. -.Sh SEE ALSO -.Xr resolv.conf 5 , -.Xr resolvconf.conf 5 , -.Xr resolver 3 , -.Xr stdin 3 .Sh AUTHORS .An Roy Marples Aq Mt r...@marples.name .Sh BUGS
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Mon Apr 11 10:41:52 UTC 2016 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.14 -r1.15 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.6 src/external/bsd/openresolv/dist/resolvconf.8.in:1.7 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.6 Tue Sep 29 09:11:47 2015 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Mon Apr 11 10:41:51 2016 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007-2015 Roy Marples +.\" Copyright (c) 2007-2016 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 27, 2015 +.Dd February 23, 2016 .Dt RESOLVCONF 8 .Os .Sh NAME @@ -125,24 +125,28 @@ file(s) for all the on the .Ar interface . .Pp -Here are some more options that -.Nm -has:- +Here are some options for the above commands:- .Bl -tag -width indent -.It Fl I -Initialise the state directory -.Pa @VARDIR@ . -This only needs to be called if the initial system boot sequence does not -automatically clean it out; for example the state directory is moved -somewhere other than -.Pa /var/run . -If used, it should only be called once as early in the system boot sequence -as possible and before -.Nm -is used to add interfaces. .It Fl f Ignore non existant interfaces. Only really useful for deleting interfaces. +.It Fl m Ar metric +Set the metric of the interface when adding it, default of 0. +Lower metrics take precedence. +This affects the default order of interfaces when listed. +.It Fl p +Marks the interface +.Pa resolv.conf +as private. +.It Fl x +Mark the interface +.Pa resolv.conf +as exclusive when adding, otherwise only use the latest exclusive interface. +.El +.Pp +.Nm +has some more commands for general usage:- +.Bl -tag -width indent .It Fl i Ar pattern List the interfaces and protocols, optionally matching .Ar pattern , @@ -157,14 +161,6 @@ If .Ar pattern is specified then we list the files for the interfaces and protocols that match it. -.It Fl m Ar metric -Set the metric of the interface when adding it, default of 0. -Lower metrics take precedence. -This affects the default order of interfaces when listed. -.It Fl p -Marks the interface -.Pa resolv.conf -as private. .It Fl u Force .Nm @@ -172,15 +168,31 @@ to update all its subscribers. .Nm does not update the subscribers when adding a resolv.conf that matches what it already has for that interface. -.It Fl x -Mark the interface -.Pa resolv.conf -as exclusive when adding, otherwise only use the latest exclusive interface. .El .Pp .Nm -also has some options designed to be used by its subscribers:- +also has some commands designed to be used by it's subscribers and +system startup:- .Bl -tag -width indent +.It Fl I +Initialise the state directory +.Pa @VARDIR@ . +This only needs to be called if the initial system boot sequence does not +automatically clean it out; for example the state directory is moved +somewhere other than +.Pa /var/run . +If used, it should only be called once as early in the system boot sequence +as possible and before +.Nm +is used to add interfaces. +.It Fl R +Echo the command used to restart a service. +.It Fl r Ar service +If the +.Ar service +is running then restart it. +If the service does not exist or is not running then zero is returned, +otherwise the result of restarting the service. .It Fl v Echo variables DOMAINS, SEARCH and NAMESERVERS so that the subscriber can configure the resolver easily. Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.14 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.15 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.14 Mon Feb 22 10:09:06 2016 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Apr 11 10:41:51 2016 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 21, 2016 +.Dd February 23, 2016 .Dt RESOLVCONF.CONF 5 .Os .Sh NAME @@ -284,23 +284,23 @@ variables, documented below. .Pp .Bl -tag -width indent .It Sy dnsmasq_service -Location of the dnsmasq service. +Name of the dnsmasq service. .It Sy dnsmasq_restart Command to restart the dnsmasq service. .It Sy dnsmasq_pid Location of the dnsmasq pidfile. .It Sy libc_service -Location of the libc service. +Name of the libc service. .It Sy libc_restart Command t
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Mon Feb 22 10:09:06 UTC 2016 Modified Files: src/external/bsd/openresolv/dist: resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.13 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.14 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.13 Tue Sep 29 09:11:47 2015 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Feb 22 10:09:06 2016 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2015 Roy Marples +.\" Copyright (c) 2009-2016 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 14, 2015 +.Dd February 21, 2016 .Dt RESOLVCONF.CONF 5 .Os .Sh NAME @@ -42,8 +42,11 @@ must contain valid shell commands. Listed below are the standard .Nm variables that may be set. -If the values contain white space for special shell characters, +If the values contain whitespace, wildcards or other special shell characters, ensure they are quoted and escaped correctly. +See the +.Sy replace +variable for an example on quoting. .Pp After updating this file, you may wish to run .Nm resolvconf -u
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Tue Sep 29 09:11:47 UTC 2015 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.12 -r1.13 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.5 src/external/bsd/openresolv/dist/resolvconf.8.in:1.6 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.5 Fri May 1 18:23:11 2015 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Tue Sep 29 09:11:47 2015 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 27, 2014 +.Dd April 27, 2015 .Dt RESOLVCONF 8 .Os .Sh NAME Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.12 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.13 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.12 Fri May 1 18:23:11 2015 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Tue Sep 29 09:11:47 2015 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 20, 2015 +.Dd May 14, 2015 .Dt RESOLVCONF.CONF 5 .Os .Sh NAME @@ -91,6 +91,11 @@ To remove a block, you can use 192.168.* These interfaces name servers will only be queried for the domains listed in their resolv.conf. Useful for VPN domains. +Setting +.Sy private_interfaces Ns ="*" +will stop the forwarding of the root zone and allows the local resolver to +recursively query the root servers directly. +Requires a local nameserver other than libc. This is equivalent to the .Nm resolvconf -p option. @@ -149,7 +154,7 @@ When set to /dev/null or NULL, .Sy resolv_conf_local_only is defaulted to NO, .Sy local_nameservers -is unset unless overriden and only the information set in +is unset unless overridden and only the information set in .Nm is written to .Sy resolv_conf . @@ -271,7 +276,7 @@ Each subscriber attempts to automaticall distribution has been catered for. Also, users could equally want to use a different version from the one installed by default, such as bind8 and bind9. -To accomodate this, the subscribers have these files in configurable +To accommodate this, the subscribers have these files in configurable variables, documented below. .Pp .Bl -tag -width indent
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Fri May 1 18:23:11 UTC 2015 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.11 -r1.12 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.4 src/external/bsd/openresolv/dist/resolvconf.8.in:1.5 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.4 Tue Oct 28 22:39:25 2014 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Fri May 1 18:23:11 2015 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007-2014 Roy Marples +.\" Copyright (c) 2007-2015 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 26, 2014 -.Dt RESOLVCONF 8 SMM +.Dd April 27, 2014 +.Dt RESOLVCONF 8 .Os .Sh NAME .Nm resolvconf @@ -34,11 +34,14 @@ .Nm .Op Fl m Ar metric .Op Fl p -.Fl a Ar interface No < Ns Pa file +.Op Fl x +.Fl a Ar interface Ns Op Ar .protocol +.No < Ns Pa file .Nm .Op Fl f -.Fl d Ar interface +.Fl d Ar interface Ns Op Ar .protocol .Nm +.Op Fl x .Fl il Ar pattern .Nm .Fl u @@ -63,7 +66,7 @@ file to via .Xr stdin 3 with the argument -.Fl a Ar interface +.Fl a Ar interface Ns Op Ar .protocol instead of the filesystem. .Nm then updates @@ -105,13 +108,21 @@ for how to configure .Nm to use a local name server. .Pp +.Nm +can mark an interfaces +.Pa resolv.conf +as exclusive. +Only the latest exclusive interface is used for processing, otherwise all are. +.Pp When an interface goes down, it should then call .Nm with -.Fl d Ar interface +.Fl d Ar interface.* arguments to delete the .Pa resolv.conf -file for the +file(s) for all the +.Ar protocols +on the .Ar interface . .Pp Here are some more options that @@ -133,7 +144,7 @@ is used to add interfaces. Ignore non existant interfaces. Only really useful for deleting interfaces. .It Fl i Ar pattern -List the interfaces, optionally matching +List the interfaces and protocols, optionally matching .Ar pattern , we have .Pa resolv.conf @@ -144,7 +155,8 @@ List the files we have. If .Ar pattern -is specified then we list the files for the interfaces that match it. +is specified then we list the files for the interfaces and protocols +that match it. .It Fl m Ar metric Set the metric of the interface when adding it, default of 0. Lower metrics take precedence. @@ -160,6 +172,10 @@ to update all its subscribers. .Nm does not update the subscribers when adding a resolv.conf that matches what it already has for that interface. +.It Fl x +Mark the interface +.Pa resolv.conf +as exclusive when adding, otherwise only use the latest exclusive interface. .El .Pp .Nm @@ -190,6 +206,29 @@ the operating systems lexical order. See .Xr resolvconf.conf 5 for details on these lists. +.Sh PROTOCOLS +Here are some suggested protocol tags to use for each +.Pa resolv.conf +file registered on an +.Ar interface Ns No :- +.Bl -tag -width indent +.It dhcp +Dynamic Host Configuration Protocol. +Initial versions of +.Nm +did not recommend a +.Ar protocol +tag be appended to the +.Ar interface +name. +When the protocol is absent, it is assumed to be the DHCP protocol. +.It ppp +Point-to-Point Protocol. +.It ra +IPv6 Router Advertisement. +.It dhcp6 +Dynamic Host Configuration Protocol, version 6. +.El .Sh IMPLEMENTATION NOTES If a subscriber has the executable bit then it is executed otherwise it is assumed to be a shell script and sourced into the current environment in a @@ -217,6 +256,10 @@ for the metric. Marks the interface .Pa resolv.conf as private. +.It Va IF_EXCLUSIVE +Marks the interface +.Pa resolv.conf +as exclusive. .El .Sh FILES .Bl -ohang Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.11 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.12 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.11 Tue Oct 28 22:39:25 2014 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Fri May 1 18:23:11 2015 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2014 Roy Marples +.\" Copyright (c) 2009-2015 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 28, 2014 -.Dt RESOLVCONF.CONF 5 SMM +.Dd March 20, 2015 +.Dt RESOLVCONF.CONF 5 .Os .Sh NAME .Nm resolvconf.conf @@ -49,7 +49,7 @@ After updating this file,
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Tue Oct 28 22:39:25 UTC 2014 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.10 -r1.11 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.3 src/external/bsd/openresolv/dist/resolvconf.8.in:1.4 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.3 Mon Oct 20 09:11:35 2014 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Tue Oct 28 22:39:25 2014 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 20, 2014 +.Dd October 26, 2014 .Dt RESOLVCONF 8 SMM .Os .Sh NAME @@ -81,7 +81,7 @@ will supply files that the resolver shou assumes it has a job to do. In some situations .Nm -needs to act as a deterent to writing to +needs to act as a deterrent to writing to .Pa /etc/resolv.conf . Where this file cannot be made immutable or you just need to toggle this behaviour, @@ -220,6 +220,8 @@ as private. .El .Sh FILES .Bl -ohang +.It Pa /etc/resolv.conf.bak +Backup file of the original resolv.conf. .It Pa @SYSCONFDIR@/resolvconf.conf Configuration file for .Nm . Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.10 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.11 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.10 Mon Oct 20 09:11:35 2014 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Tue Oct 28 22:39:25 2014 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 20, 2014 +.Dd October 28, 2014 .Dt RESOLVCONF.CONF 5 SMM .Os .Sh NAME @@ -48,6 +48,9 @@ ensure they are quoted and escaped corre After updating this file, you may wish to run .Nm resolvconf -u to apply the new configuration. +.Pp +When a dynmically generated list is appended or prepended to, the whole +is made unique where left-most wins. .Sh RESOLVCONF OPTIONS .Bl -tag -width indent .It Sy resolvconf @@ -91,6 +94,34 @@ Useful for VPN domains. This is equivalent to the .Nm resolvconf -p option. +.It Sy replace +Is a space separated list of replacement keywords. The syntax is this: +.Va $keyword Ns / Ns Va $match Ns / Ns Va $replacement +.Pp +Example, given this resolv.conf: +.D1 domain foo.org +.D1 search foo.org dead.beef +.D1 nameserver 1.2.3.4 +.D1 nameserver 2.3.4.5 +and this configuaration: +.D1 replace="search/foo*/bar.com nameserver/1.2.3.4/5.6.7.8 nameserver/2.3.4.5/" +you would get this resolv.conf instead: +.D1 domain foo.org +.D1 search bar.com +.D1 nameserver 5.6.7.8 +.It Sy replace_sub +Works the same way as +.Sy replace +except it works on each space separated value rather than the whole line, +so it's useful for the replacing a single domain within the search directive. +Using the same example resolv.conf and changing +.Sy replace +to +.Sy replace_sub , +you would get this resolv.conf instead: +.D1 domain foo.org +.D1 search bar.com dead.beef +.D1 nameserver 5.6.7.8 .It Sy state_dir Override the default state directory of .Pa @VARDIR@ . @@ -132,6 +163,14 @@ name server. Set this to NO to also list non-local nameservers. This will give you working DNS even if the local nameserver stops functioning at the expense of duplicated server queries. +.It Sy append_nameservers +Append name servers to the dynamically generated list. +.It Sy prepend_nameservers +Prepend name servers to the dynamically generated list. +.It Sy append_search +Append search domains to the dynamically generated list. +.It Sy prepend_search +Prepend search domains to the dynamically generated list. .El .Sh SUBSCRIBER OPTIONS openresolv ships with subscribers for the name servers
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Mon Oct 20 09:11:35 UTC 2014 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.9 -r1.10 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.2 src/external/bsd/openresolv/dist/resolvconf.8.in:1.3 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.2 Sat Jul 20 21:40:04 2013 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Mon Oct 20 09:11:35 2014 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007-2012 Roy Marples +.\" Copyright (c) 2007-2014 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 19, 2012 +.Dd October 20, 2014 .Dt RESOLVCONF 8 SMM .Os .Sh NAME @@ -78,6 +78,20 @@ then will supply files that the resolver should be configured to include. .Pp .Nm +assumes it has a job to do. +In some situations +.Nm +needs to act as a deterent to writing to +.Pa /etc/resolv.conf . +Where this file cannot be made immutable or you just need to toggle this +behaviour, +.Nm +can be disabled by adding +.Sy resolvconf Ns = Ns NO +to +.Xr resolvconf.conf 5 . +.Pp +.Nm can mark an interfaces .Pa resolv.conf as private. @@ -142,18 +156,24 @@ as private. .It Fl u Force .Nm -to update all it's subscribers. +to update all its subscribers. .Nm does not update the subscribers when adding a resolv.conf that matches what it already has for that interface. .El .Pp .Nm -also has some options designed to be used by it's subscribers:- +also has some options designed to be used by its subscribers:- .Bl -tag -width indent .It Fl v Echo variables DOMAINS, SEARCH and NAMESERVERS so that the subscriber can configure the resolver easily. +.It Fl V +Same as +.Fl v +except that only the information configured in +.Xr resolvconf.conf 5 +is set. .El .Sh INTERFACE ORDERING For Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.9 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.10 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.9 Sat Jul 20 21:40:04 2013 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Oct 20 09:11:35 2014 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2013 Roy Marples +.\" Copyright (c) 2009-2014 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 27, 2013 +.Dd October 20, 2014 .Dt RESOLVCONF.CONF 5 SMM .Os .Sh NAME @@ -42,12 +42,19 @@ must contain valid shell commands. Listed below are the standard .Nm variables that may be set. +If the values contain white space for special shell characters, +ensure they are quoted and escaped correctly. .Pp After updating this file, you may wish to run .Nm resolvconf -u to apply the new configuration. .Sh RESOLVCONF OPTIONS .Bl -tag -width indent +.It Sy resolvconf +Set to NO to disable +.Nm resolvconf +from running any subscribers. +Defaults to YES. .It Sy interface_order These interfaces will always be processed first. If unset, defaults to the following:- @@ -56,6 +63,9 @@ If unset, defaults to the following:- These interfaces will be processed next, unless they have a metric. If unset, defaults to the following:- .D1 tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]* +.It Sy local_nameservers +If unset, defaults to the following:- +.D1 127.* 0.0.0.0 255.255.255.255 ::1 .It Sy search_domains Prepend search domains to the dynamically generated list. .It Sy search_domains_append @@ -104,6 +114,14 @@ A list of libc resolver options, as spec When set to YES the latest resolv.conf is written to .Sy resolv_conf without any alteration. +When set to /dev/null or NULL, +.Sy resolv_conf_local_only +is defaulted to NO, +.Sy local_nameservers +is unset unless overriden and only the information set in +.Nm +is written to +.Sy resolv_conf . .It Sy resolv_conf_sortlist A libc resolver sortlist, as specified in .Xr resolv.conf 5 . @@ -124,6 +142,10 @@ and .Xr unbound 8 . Each subscriber can create configuration files which should be included in in the subscribers main configuration file. +.Pp +To disable a subscriber, simply set it's name to NO. +For example, to disable the libc subscriber you would set: +.D1 libc=NO .Bl -tag -width indent .It Sy dnsmasq_conf This file tells dnsmasq wh
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Tue Jun 4 09:40:12 UTC 2013 Modified Files: src/external/bsd/openresolv/dist: resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.7 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.8 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.7 Thu Mar 21 04:57:38 2013 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Tue Jun 4 09:40:12 2013 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2012 Roy Marples +.\" Copyright (c) 2009-2013 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 2, 2012 +.Dd April 27, 2013 .Dt RESOLVCONF.CONF 5 SMM .Os .Sh NAME @@ -108,11 +108,12 @@ without any alteration. A libc resolver sortlist, as specified in .Xr resolv.conf 5 . .It Sy resolv_conf_local_only -If a local nameserver is configured then the default is just to specify that +If a local name server is configured then the default is just to specify that and ignore all other entries as they will be configured for the local -nameserver. -Set this to YES to list them instead, if you need working DNS and the local -nameserver stops functioning at the expense of duplicated server queries. +name server. +Set this to NO to also list non-local nameservers. +This will give you working DNS even if the local nameserver stops functioning +at the expense of duplicated server queries. .El .Sh SUBSCRIBER OPTIONS openresolv ships with subscribers for the name servers @@ -125,28 +126,31 @@ Each subscriber can create configuration in the subscribers main configuration file. .Bl -tag -width indent .It Sy dnsmasq_conf -This file tells dnsmasq which nameservers to use for specific domains. +This file tells dnsmasq which name servers to use for specific domains. .It Sy dnsmasq_resolv -This file tells dnsmasq which nameservers to use for global lookups. +This file tells dnsmasq which name servers to use for global lookups. .Pp Example resolvconf.conf for dnsmasq: -.D1 nameservers=127.0.0.1 +.D1 name_servers=127.0.0.1 .D1 dnsmasq_conf=/etc/dnsmasq-conf.conf .D1 dnsmasq_resolv=/etc/dnsmasq-resolv.conf .Pp Example dnsmasq.conf: .D1 listen-address=127.0.0.1 +.D1 # If dnsmasq is compiled for DBus then we can take +.D1 # advantage of not having to restart dnsmasq. +.D1 enable-dbus .D1 conf-file=/etc/dnsmasq-conf.conf .D1 resolv-file=/etc/dnsmasq-resolv.conf .It Sy named_options Include this file in the named options block. -This file tells named which nameservers to use for global lookups. +This file tells named which name servers to use for global lookups. .It Sy named_zones Include this file in the named global scope, after the options block. -This file tells named which nameservers to use for specific domains. +This file tells named which name servers to use for specific domains. .Pp Example resolvconf.conf for named: -.D1 nameservers=127.0.0.1 +.D1 name_servers=127.0.0.1 .D1 named_options=/etc/named-options.conf .D1 named_zones=/etc/named-zones.conf .Pp @@ -164,12 +168,12 @@ setup to read .Pa pdnsd_resolv as documented below. .It Sy pdnsd_resolv -This file tells pdnsd about global nameservers. +This file tells pdnsd about global name servers. If this variable is not set then it's written to .Pa pdnsd_conf . .Pp Example resolvconf.conf for pdnsd: -.D1 nameservers=127.0.0.1 +.D1 name_servers=127.0.0.1 .D1 pdnsd_conf=/etc/pdnsd.conf .D1 # pdnsd_resolv=/etc/pdnsd-resolv.conf .Pp @@ -185,10 +189,10 @@ Example pdnsd.conf: .D1 # file="/etc/pdnsd-resolv.conf"; .D1 } .It Sy unbound_conf -This file tells unbound about specific and global nameservers. +This file tells unbound about specific and global name servers. .Pp Example resolvconf.conf for unbound: -.D1 nameservers=127.0.0.1 +.D1 name_servers=127.0.0.1 .D1 unbound_conf=/etc/unbound-resolvconf.conf .Pp Example unbound.conf: @@ -208,8 +212,6 @@ To accomodate this, the subscribers have variables, documented below. .Pp .Bl -tag -width indent -.It Sy dbus_pid -Locaiton of the dbus pidfile. .It Sy dnsmasq_service Location of the dnsmasq service. .It Sy dnsmasq_restart @@ -241,7 +243,7 @@ and .An Roy Marples Aq r...@marples.name .Sh BUGS Each distribution is a special snowflake and likes to name the same thing -differently, namely the named service script and the dbus pidfile location. +differently, namely the named service script. .Pp Please report them to .Lk http://roy.marples.name/projects/openresolv
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: joerg Date: Thu Mar 21 04:57:39 UTC 2013 Modified Files: src/external/bsd/openresolv/dist: resolvconf.conf.5.in Log Message: Add missing .El. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.6 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.7 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.6 Thu Dec 6 11:41:07 2012 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Thu Mar 21 04:57:38 2013 @@ -232,6 +232,7 @@ Location of the unbound service. Command to restart the unbound service. .It Sy unbound_pid Location of the unbound pidfile. +.El .Sh SEE ALSO .Xr resolv.conf 5 and
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Thu Dec 6 11:41:07 UTC 2012 Modified Files: src/external/bsd/openresolv/dist: resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.5 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.6 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.5 Mon Mar 26 14:43:01 2012 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Thu Dec 6 11:41:07 2012 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 19, 2012 +.Dd October 2, 2012 .Dt RESOLVCONF.CONF 5 SMM .Os .Sh NAME @@ -194,6 +194,44 @@ Example resolvconf.conf for unbound: Example unbound.conf: .D1 include: /etc/unbound-resolvconf.conf .El +.Sh SUBSCRIBER INTEGRATION +Not all distributions store the files the subscribers need in the same +locations. +For example, named service scripts have been called named, bind and rc.bind +and they could be located in a directory called /etc/rc.d, /etc/init.d or +similar. +Each subscriber attempts to automatically configure itself, but not every +distribution has been catered for. +Also, users could equally want to use a different version from the one +installed by default, such as bind8 and bind9. +To accomodate this, the subscribers have these files in configurable +variables, documented below. +.Pp +.Bl -tag -width indent +.It Sy dbus_pid +Locaiton of the dbus pidfile. +.It Sy dnsmasq_service +Location of the dnsmasq service. +.It Sy dnsmasq_restart +Command to restart the dnsmasq service. +.It Sy dnsmasq_pid +Location of the dnsmasq pidfile. +.It Sy libc_service +Location of the libc service. +.It Sy libc_restart +Command to restart the libc service. +.It Sy named_service +Location of the named service. +.It Sy named_restart +Command to restart the named service. +.It Sy pdnsd_restart +Command to restart the pdnsd service. +.It Sy unbound_service +Location of the unbound service. +.It Sy unbound_restart +Command to restart the unbound service. +.It Sy unbound_pid +Location of the unbound pidfile. .Sh SEE ALSO .Xr resolv.conf 5 and @@ -201,5 +239,8 @@ and .Sh AUTHORS .An Roy Marples Aq r...@marples.name .Sh BUGS +Each distribution is a special snowflake and likes to name the same thing +differently, namely the named service script and the dbus pidfile location. +.Pp Please report them to .Lk http://roy.marples.name/projects/openresolv
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Thu Dec 6 11:38:17 UTC 2012 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17979 Log Message: Import openresolv-3.5.3 with the following changes: * man page improvements * dnsmasq + dbus + IPv6 linklocal support (requires dnsmasq-2.64) * sort interface protocols as well as interface (bge0, bge0:ra, bge0:dhcp6) Status: Vendor Tag: roy Release Tags: openresolv-3-5-3 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in U src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Tue Mar 27 21:21:25 UTC 2012 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27234 Log Message: Import openresolv-3.5.1 to fix resolv_conf_local_only. Status: Vendor Tag: roy Release Tags: openresolv-3-5-1 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in U src/external/bsd/openresolv/dist/resolvconf.8.in U src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in No conflicts created by this import
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Mon Mar 26 14:43:01 UTC 2012 Modified Files: src/external/bsd/openresolv/dist: resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.4 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.5 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.4 Thu Nov 24 00:37:40 2011 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Mar 26 14:43:01 2012 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2011 Roy Marples +.\" Copyright (c) 2009-2012 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 11, 2011 +.Dd March 19, 2012 .Dt RESOLVCONF.CONF 5 SMM .Os .Sh NAME @@ -60,12 +60,20 @@ If unset, defaults to the following:- Prepend search domains to the dynamically generated list. .It Sy search_domains_append Append search domains to the dynamically generated list. +.It Sy domain_blacklist +A list of domains to be removed from consideration. +To remove a domain, you can use foo.* +To remove a sub domain, you can use *.bar .It Sy name_servers Prepend name servers to the dynamically generated list. You should set this to 127.0.0.1 if you use a local name server other than libc. .It Sy name_servers_append Append name servers to the dynamically generated list. +.It Sy name_server_blacklist +A list of name servers to be removed from consideration. +The default is 0.0.0.0 as some faulty routers send it via DHCP. +To remove a block, you can use 192.168.* .It Sy private_interfaces These interfaces name servers will only be queried for the domains listed in their resolv.conf. @@ -99,6 +107,12 @@ without any alteration. .It Sy resolv_conf_sortlist A libc resolver sortlist, as specified in .Xr resolv.conf 5 . +.It Sy resolv_conf_local_only +If a local nameserver is configured then the default is just to specify that +and ignore all other entries as they will be configured for the local +nameserver. +Set this to YES to list them instead, if you need working DNS and the local +nameserver stops functioning at the expense of duplicated server queries. .El .Sh SUBSCRIBER OPTIONS openresolv ships with subscribers for the name servers @@ -187,4 +201,5 @@ and .Sh AUTHORS .An Roy Marples Aq r...@marples.name .Sh BUGS -Please report them to http://roy.marples.name/projects/openresolv +Please report them to +.Lk http://roy.marples.name/projects/openresolv
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Mon Mar 26 14:41:34 UTC 2012 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27242 Log Message: Import openresolv-3.5.0 with the following changes: * Added resolv_conf_local_only which defaults to true. This means that if you configure a local nameserver we don't add any other nameservers to resolv.conf to avoid duplicate queries. * Add domain_blacklist and name_server_blacklist variables. We default name_server_blacklist to 0.0.0.0 to handle some faulty routers. * Add .Lk macro to URLs. * Fix IPv6 parsing on domains which include an IPv4 server for dnsmasq. Status: Vendor Tag: roy Release Tags: openresolv-3-5-0 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in U src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Tue Jan 31 09:19:58 UTC 2012 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1894 Log Message: Import openresolv-3.4.6 with the following change from 3.4.5 * dnsmasq subscriber correctly sets IPv6 domain specific servers over dbus Status: Vendor Tag: roy Release Tags: openresolv-3-4-6 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in U src/external/bsd/openresolv/dist/resolvconf.8.in U src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in No conflicts created by this import
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Thu Nov 24 00:37:40 UTC 2011 Modified Files: src/external/bsd/openresolv/dist: resolvconf.conf.5.in Log Message: sync To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.3 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.4 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.3 Mon Jun 13 11:07:50 2011 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Thu Nov 24 00:37:40 2011 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 21, 2011 +.Dd August 11, 2011 .Dt RESOLVCONF.CONF 5 SMM .Os .Sh NAME @@ -96,6 +96,9 @@ A list of libc resolver options, as spec When set to YES the latest resolv.conf is written to .Sy resolv_conf without any alteration. +.It Sy resolv_conf_sortlist +A libc resolver sortlist, as specified in +.Xr resolv.conf 5 . .El .Sh SUBSCRIBER OPTIONS openresolv ships with subscribers for the name servers
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Thu Nov 24 00:36:08 UTC 2011 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5619 Log Message: Import openresolv-3.4.5 with the following changes since the last version: * More printf portabitiy fixes. * Use read -r to avoid backslash problems. * If we have a valid domain, put that in resolv.conf as well as search. This does not fix a technical problem, just stops me getting bug reports. * Update metric and privacy even if resolv.conf didn't change. * sortlist is now supported. * Ensure subscriber config directories exist before writing the configs * Don't create pdnsd.conf if it doesn't exist or is not writeable. Status: Vendor Tag: roy Release Tags: openresolv-3-4-5 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in U src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: roy
Date: Mon Jun 13 11:07:50 UTC 2011
Modified Files:
src/external/bsd/openresolv/dist: resolvconf.conf.5.in
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openresolv/dist/resolvconf.conf.5.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in
diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.2 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.3
--- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.2 Wed Jun 16 22:26:56 2010
+++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Jun 13 11:07:50 2011
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2009 Roy Marples
+.\" Copyright (c) 2009-2011 Roy Marples
.\" All rights reserved
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd November 20, 2009
+.Dd April 21, 2011
.Dt RESOLVCONF.CONF 5 SMM
.Os
.Sh NAME
@@ -43,7 +43,7 @@
.Nm
variables that may be set.
.Pp
-After updaing this file, you may wish to run
+After updating this file, you may wish to run
.Nm resolvconf -u
to apply the new configuration.
.Sh RESOLVCONF OPTIONS
@@ -56,6 +56,16 @@
These interfaces will be processed next, unless they have a metric.
If unset, defaults to the following:-
.D1 tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*
+.It Sy search_domains
+Prepend search domains to the dynamically generated list.
+.It Sy search_domains_append
+Append search domains to the dynamically generated list.
+.It Sy name_servers
+Prepend name servers to the dynamically generated list.
+You should set this to 127.0.0.1 if you use a local name server other than
+libc.
+.It Sy name_servers_append
+Append name servers to the dynamically generated list.
.It Sy private_interfaces
These interfaces name servers will only be queried for the domains listed
in their resolv.conf.
@@ -82,12 +92,6 @@
.It Sy resolv_conf_options
A list of libc resolver options, as specified in
.Xr resolv.conf 5 .
-.It Sy search_domains
-Prepend search domains to the dynamically generated list.
-.It Sy name_servers
-Prepend name servers to the dynamically generated list.
-You should set this to 127.0.0.1 if you use a local name server other than
-libc.
.It Sy resolv_conf_passthrough
When set to YES the latest resolv.conf is written to
.Sy resolv_conf
@@ -96,7 +100,8 @@
.Sh SUBSCRIBER OPTIONS
openresolv ships with subscribers for the name servers
.Xr dnsmasq 8 ,
-.Xr named 8
+.Xr named 8 ,
+.Xr pdnsd 8
and
.Xr unbound 8 .
Each subscriber can create configuration files which should be included in
@@ -134,6 +139,34 @@
.D1 include "/etc/named-options.conf";
.D1 };
.D1 include "/etc/named-zones.conf";
+.It Sy pdnsd_conf
+This is the main pdnsd configuration file which we modify to add our
+forward domains to.
+If this variable is not set then we rely on the pdnsd configuration file
+setup to read
+.Pa pdnsd_resolv
+as documented below.
+.It Sy pdnsd_resolv
+This file tells pdnsd about global nameservers.
+If this variable is not set then it's written to
+.Pa pdnsd_conf .
+.Pp
+Example resolvconf.conf for pdnsd:
+.D1 nameservers=127.0.0.1
+.D1 pdnsd_conf=/etc/pdnsd.conf
+.D1 # pdnsd_resolv=/etc/pdnsd-resolv.conf
+.Pp
+Example pdnsd.conf:
+.D1 global {
+.D1 server_ip = 127.0.0.1;
+.D1 status_ctl = on;
+.D1 }
+.D1 server {
+.D1 # A server definition is required, even if emtpy.
+.D1 label="empty";
+.D1 proxy_only=on;
+.D1 # file="/etc/pdnsd-resolv.conf";
+.D1 }
.It Sy unbound_conf
This file tells unbound about specific and global nameservers.
.Pp
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Mon Jun 13 11:05:20 UTC 2011 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2549 Log Message: Import openresolv-3.4.2 with the following fix: * Use printf(1) correctly Status: Vendor Tag: roy Release Tags: openresolv-3-4-2 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in U src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in N src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: joerg
Date: Wed Jun 16 22:26:56 UTC 2010
Modified Files:
src/external/bsd/openresolv/dist: resolvconf.conf.5.in
Log Message:
Do not abuse .Ta, but use a real tabulator.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/openresolv/dist/resolvconf.conf.5.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in
diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.1.1.1 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.2
--- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.1.1.1 Sat Nov 21 02:40:55 2009
+++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Wed Jun 16 22:26:56 2010
@@ -130,8 +130,8 @@
.Pp
Example named.conf:
.D1 options {
-.D1 Ta listen-on { 127.0.0.1; };
-.D1 Ta include "/etc/named-options.conf";
+.D1 listen-on { 127.0.0.1; };
+.D1 include "/etc/named-options.conf";
.D1 };
.D1 include "/etc/named-zones.conf";
.It Sy unbound_conf
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Fri Dec 4 14:11:49 UTC 2009 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23526 Log Message: Import openresolv-3.3.4 Changes from openresolv-3.3.3 include: * private_interfaces is now shell expandable (ie, fxp*) * dnsmasq resolver restarting with DBus is now fixed * unbound resolver is sent SIGHUP for reload instead of forced restart * subscribers with the execute bit are executed, otherwise sourced into a subshell for speed Status: Vendor Tag: roy Release Tags: openresolv-3-3-4 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in U src/external/bsd/openresolv/dist/resolvconf.8.in U src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/unbound.in No conflicts created by this import
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Sat Nov 21 02:40:55 UTC 2009 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4399 Log Message: Import openresolv-3.3.3 OK: core@, joerg@ Status: Vendor Tag: roy Release Tags: openresolv-3-3-3 N src/external/bsd/openresolv/dist/README N src/external/bsd/openresolv/dist/resolvconf.in N src/external/bsd/openresolv/dist/resolvconf.8.in N src/external/bsd/openresolv/dist/resolvconf.conf.5.in N src/external/bsd/openresolv/dist/libc.in N src/external/bsd/openresolv/dist/dnsmasq.in N src/external/bsd/openresolv/dist/named.in N src/external/bsd/openresolv/dist/unbound.in No conflicts created by this import
