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

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

details:   https://anonhg.NetBSD.org/src/rev/1793d6b32ea6
branches:  trunk
changeset: 766014:1793d6b32ea6
user:      roy <roy%NetBSD.org@localhost>
date:      Mon Jun 13 11:07:50 2011 +0000

description:
Sync

diffstat:

 external/bsd/openresolv/dist/resolvconf.conf.5.in |  53 ++++++++++++++++++----
 1 files changed, 43 insertions(+), 10 deletions(-)

diffs (102 lines):

diff -r 6da0ac21cd5e -r 1793d6b32ea6 external/bsd/openresolv/dist/resolvconf.conf.5.in
--- a/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Jun 13 11:05:19 2011 +0000
+++ b/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Jun 13 11:07:50 2011 +0000
@@ -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