[src/trunk]: src/external/bsd/openresolv/dist Sync

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c36e30b0914c
branches:  trunk
changeset: 333308:c36e30b0914c
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Oct 28 22:39:25 2014 +0000

description:
Sync

diffstat:

 external/bsd/openresolv/dist/resolvconf.8.in      |   6 ++-
 external/bsd/openresolv/dist/resolvconf.conf.5.in |  41 ++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diffs (102 lines):

diff -r 7a97777db9e6 -r c36e30b0914c external/bsd/openresolv/dist/resolvconf.8.in
--- a/external/bsd/openresolv/dist/resolvconf.8.in      Tue Oct 28 22:37:59 2014 +0000
+++ b/external/bsd/openresolv/dist/resolvconf.8.in      Tue Oct 28 22:39:25 2014 +0000
@@ -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 @@
 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 @@
 .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 .
diff -r 7a97777db9e6 -r c36e30b0914c external/bsd/openresolv/dist/resolvconf.conf.5.in
--- a/external/bsd/openresolv/dist/resolvconf.conf.5.in Tue Oct 28 22:37:59 2014 +0000
+++ b/external/bsd/openresolv/dist/resolvconf.conf.5.in Tue Oct 28 22:39:25 2014 +0000
@@ -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 @@
 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 @@
 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 @@
 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