aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2016-07-19 23:22:06 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2016-07-19 23:22:06 +0000
commit2a4f382499af9e58edf5d7ed1358912c45678b6f (patch)
treeb3e81f5c79e118edff3bd4aefcd5895b442f9e54
parente4bff5961204a7cf386bc50115423ba3916acf02 (diff)
downloadsrc-2a4f382499af9e58edf5d7ed1358912c45678b6f.tar.gz
src-2a4f382499af9e58edf5d7ed1358912c45678b6f.zip
Import openresolv 3.8.1vendor/openresolv/3.8.1
Notes
Notes: svn path=/vendor/openresolv/dist/; revision=303048 svn path=/vendor/openresolv/3.8.1/; revision=303049; tag=vendor/openresolv/3.8.1
-rw-r--r--resolvconf.8.in16
-rw-r--r--resolvconf.conf.5.in8
-rw-r--r--resolvconf.in11
3 files changed, 19 insertions, 16 deletions
diff --git a/resolvconf.8.in b/resolvconf.8.in
index c0174a052ffa..4fa5b4bc5f06 100644
--- a/resolvconf.8.in
+++ b/resolvconf.8.in
@@ -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 May 7, 2016
.Dt RESOLVCONF 8
.Os
.Sh NAME
@@ -64,7 +64,7 @@ solves this by letting the daemon send their
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 after the libc subscriber is run.
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 roy@marples.name
.Sh BUGS
diff --git a/resolvconf.conf.5.in b/resolvconf.conf.5.in
index 2c3ac9c502ab..7b410abbe5e9 100644
--- a/resolvconf.conf.5.in
+++ b/resolvconf.conf.5.in
@@ -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 April 28, 2016
.Dt RESOLVCONF.CONF 5
.Os
.Sh NAME
@@ -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 roy@marples.name
.Sh BUGS
diff --git a/resolvconf.in b/resolvconf.in
index db3269d2f0d0..3ac72f349544 100644
--- a/resolvconf.in
+++ b/resolvconf.in
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
RESOLVCONF="$0"
-OPENRESOLV_VERSION="3.8.0"
+OPENRESOLV_VERSION="3.8.1"
SYSCONFDIR=@SYSCONFDIR@
LIBEXECDIR=@LIBEXECDIR@
VARDIR=@VARDIR@
@@ -152,7 +152,10 @@ parse_resolv()
private=false
for p in $private_interfaces; do
case "$iface" in
- "$p"|"$p":*) private=true; break;;
+ "$p"|"$p":*)
+ private=true
+ break
+ ;;
esac
done
fi
@@ -270,11 +273,11 @@ detect_init()
local status="@STATUSARG@"
: ${status:=status}
if [ -x /bin/systemctl -a -S /run/systemd/private ]; then
- RESTARTCMD="if /bin/systemctl --quiet is-active; then
+ RESTARTCMD="if /bin/systemctl --quiet is-active \$1.service; then
/bin/systemctl restart \$1.service;
fi"
elif [ -x /usr/bin/systemctl -a -S /run/systemd/private ]; then
- RESTARTCMD="if /usr/bin/systemctl --quiet is-active; then
+ RESTARTCMD="if /usr/bin/systemctl --quiet is-active \$1.service; then
/usr/bin/systemctl restart \$1.service;
fi"
elif [ -x /sbin/rc-service -a \