Blame SOURCES/autofs-5.0.9-amd-lookup-update-man-pages.patch

6bbd11
autofs-5.0.9 - amd lookup update man pages
6bbd11
6bbd11
From: Ian Kent <raven@themaw.net>
6bbd11
6bbd11
Update man pages to reflect the addition of the amd map format
6bbd11
parser, move configuration to it's own man page and update with
6bbd11
amd options descriptions.
6bbd11
---
6bbd11
 man/auto.master.5.in           |  183 ++----------------
6bbd11
 man/autofs.5                   |  346 +++++++++++++++++++++++++++++++++-
6bbd11
 man/autofs.8.in                |    1 
6bbd11
 man/autofs.conf.5.in           |  412 ++++++++++++++++++++++++++++++++++++++++
6bbd11
 man/autofs_ldap_auth.conf.5.in |    1 
6bbd11
 man/automount.8                |    1 
6bbd11
 6 files changed, 782 insertions(+), 162 deletions(-)
6bbd11
 create mode 100644 man/autofs.conf.5.in
6bbd11
6bbd11
diff --git a/man/auto.master.5.in b/man/auto.master.5.in
6bbd11
index 59df04f..2267550 100644
6bbd11
--- a/man/auto.master.5.in
6bbd11
+++ b/man/auto.master.5.in
6bbd11
@@ -122,14 +122,18 @@ will be ignored if its name is not ended with the suffix. In addition a dot file
6bbd11
 which name is started with "." is also ignored.
6bbd11
 .RE
6bbd11
 .TP
6bbd11
-\fBformat\fP
6bbd11
-Format of the map data; currently the only formats
6bbd11
-recognized are \fBsun\fP, which is a subset of the Sun automounter map
6bbd11
-format, and \fBhesiod\fP, for hesiod filesys entries.  If the format is
6bbd11
-left unspecified, it defaults to \fBsun\fP for all map types except
6bbd11
-\fBhesiod\fP.
6bbd11
-.TP
6bbd11
-\fBmap\fP
6bbd11
+.B format
6bbd11
+.br
6bbd11
+Format of the map data; currently the formats recognized are \fBsun\fP,
6bbd11
+which is a subset of the Sun automounter map format, \fBhesiod\fP, for
6bbd11
+hesiod filesys entries and \fBamd\fP for amd formated map entries.
6bbd11
+If the format is left unspecified, it defaults to \fBsun\fP for all map
6bbd11
+types except \fBhesiod\fP unless it is a top level \fBamd\fP mount that
6bbd11
+has a configuration entry for the mount point path, in which case the
6bbd11
+format used is \fBamd\fP.
6bbd11
+.TP
6bbd11
+.B map
6bbd11
+.br
6bbd11
 Name of the map to use.  This is an absolute UNIX pathname
6bbd11
 for maps of types \fBfile\fP, \fBdir\fP, or \fBprogram\fP, and the name of a database
6bbd11
 in the case for maps of type \fByp\fP, \fBnisplus\fP, or \fBhesiod\fP or
6bbd11
@@ -205,87 +209,6 @@ or in the configuration.
6bbd11
 Set the timeout for caching failed key lookups. This option can be
6bbd11
 used to override the global default given either on the command line
6bbd11
 or in the configuration.
6bbd11
-.SH AUTOFS CONFIGURATION
6bbd11
-.P
6bbd11
-There are two files that amy contain configuration settings
6bbd11
-.nh
6bbd11
-.BR @@autofsmapdir@@/autofs.conf .
6bbd11
-.hy
6bbd11
-and
6bbd11
-.BR @@autofsconfdir@@/autofs .
6bbd11
-.hy
6bbd11
-The former contains the bulk of configuration options while the later
6bbd11
-contains entries to be set in the environment for use by the init
6bbd11
-sub-system.
6bbd11
-.TP
6bbd11
-The only entry currently present in the init system configuration
6bbd11
-is OPTIONS which may be used to specify options to be used when
6bbd11
-starting
6bbd11
-.BR automount (8) .
6bbd11
-.TP
6bbd11
-Previously all configuration entries were located in the init system
6bbd11
-configuration file and their values were set in the environment for
6bbd11
-later use by autofs. Configuration entries that were set in the
6bbd11
-environment continue to be set in the environment at program startup
6bbd11
-and any setting already present in the environment takes precedence.
6bbd11
-.SH SYSTEM DEFAULTS CONFIGURATION
6bbd11
-.P
6bbd11
-The value of most settings may be set in the configuration file
6bbd11
-.nh
6bbd11
-.BR @@autofsmapdir@@/autofs.conf .
6bbd11
-.hy
6bbd11
-Configuration entries are "name = value" pairs and the name is case
6bbd11
-insensitive. Older configuration names had a DEFAULTS_ prefix which
6bbd11
-is appended to the configuration name when a value isn't found and
6bbd11
-the search repeated.
6bbd11
-.TP
6bbd11
-An optional section name
6bbd11
-.nh
6bbd11
-.BR [ autofs ]
6bbd11
-.hy
6bbd11
-may also be given.
6bbd11
-.TP
6bbd11
-The available configuration entries are:
6bbd11
-.TP
6bbd11
-.B timeout
6bbd11
-Sets the default mount timeout in seconds. The internal program
6bbd11
-default is 10 minutes, but the default installed configuration
6bbd11
-overrides this and sets the timeout to 5 minutes to be consistent
6bbd11
-with earlier autofs releases.
6bbd11
-.TP
6bbd11
-.B negative_timeout
6bbd11
-Set the default timeout for caching failed key lookups (program default
6bbd11
-60). If the equivalent command line option is given it will override this
6bbd11
-setting.
6bbd11
-.TP
6bbd11
-.B mount_wait
6bbd11
-Set the default time to wait for a response from a spawned mount(8)
6bbd11
-before sending it a SIGTERM. Note that we still need to wait for the
6bbd11
-RPC layer to timeout before the sub-process exits so this isn't ideal
6bbd11
-but it is the best we can do. The default is to wait until mount(8)
6bbd11
-returns without intervention.
6bbd11
-.TP
6bbd11
-.B umount_wait
6bbd11
-Set the default time to wait for a response from a spawned umount(8)
6bbd11
-before sending it a SIGTERM. Note that we still need to wait for the
6bbd11
-RPC layer to timeout before the sub-process exits so this isn't ideal
6bbd11
-but it is the best we can do.
6bbd11
-.TP
6bbd11
-.B browse_mode
6bbd11
-Maps are browsable by default (program default "yes").
6bbd11
-.TP
6bbd11
-.B mount_nfs_default_protocol
6bbd11
-Specify the default protocol used by mount.nfs(8) (program default 3). Since
6bbd11
-we can't identify this default automatically we need to set it in the autofs
6bbd11
-configuration.
6bbd11
-.TP
6bbd11
-.B append_options
6bbd11
-Determine whether global options, given on the command line or per mount
6bbd11
-in the master map, are appended to map entry options or if the map entry
6bbd11
-options replace the global options (program default "yes", append options).
6bbd11
-.TP
6bbd11
-.B logging
6bbd11
-set default log level "none", "verbose" or "debug" (program default "none").
6bbd11
 .SH BUILTIN MAP -hosts
6bbd11
 If "-hosts" is given as the map then accessing a key under the mount point
6bbd11
 which corresponds to a hostname will allow access to the exports of that
6bbd11
@@ -341,76 +264,21 @@ The object classes and attributes used for accessing automount maps in
6bbd11
 LDAP can be changed by setting entries in the autofs configuration
6bbd11
 located in
6bbd11
 .nh
6bbd11
-.BR @@autofsmapdir@@/autofs.conf .
6bbd11
+.BR @@autofsconfdir@@/autofs.conf .
6bbd11
 .hy
6bbd11
 .TP
6bbd11
 .B NOTE:
6bbd11
 If a schema is given in the configuration then all the schema configuration
6bbd11
 values must be set, any partial schema specification will be ignored.
6bbd11
-.P
6bbd11
-The configuration settings available are:
6bbd11
-.TP
6bbd11
-.B ldap_timeout
6bbd11
-Set the network response timeout (default 8).
6bbd11
-Set timeout value for the synchronous API  calls. The default is the LDAP
6bbd11
-library default of an infinite timeout.
6bbd11
 .TP
6bbd11
-.B ldap_network_timeout
6bbd11
-Set the network response timeout (default 8).
6bbd11
-.TP
6bbd11
-.B ldap_uri
6bbd11
-A space seperated list of server uris of the form <proto>://<server>[/]
6bbd11
-where <proto> can be ldap or ldaps. The option can be given multiple times.
6bbd11
-Map entries that include a server name override this option and it is then
6bbd11
-not used. Default is an empty list in which case either the server given
6bbd11
-in a map entry or the LDAP configured default is used. This uri list is read at
6bbd11
-startup and whenever the daemon receives a HUP signal.
6bbd11
-.P
6bbd11
-This configuration option can also be used to request autofs lookup SRV RRs
6bbd11
-for a domain of the form <proto>:///[<domain dn>]. Note that a trailing
6bbd11
-"/" is not allowed when using this form. If the domain dn is not specified
6bbd11
-the dns domain name (if any) is used to construct the domain dn for the
6bbd11
-SRV RR lookup. The server list returned from an SRV RR lookup is refreshed
6bbd11
-according to the minimum ttl found in the SRV RR records or after one hour,
6bbd11
-whichever is less.
6bbd11
+For \fBamd\fP format maps a different schema is used:
6bbd11
 .TP
6bbd11
-.B search_base
6bbd11
-The base dn to use when searching for amap base dn. This entry may be
6bbd11
-given multiple times and each will be checked for a map base dn in
6bbd11
-the order they occur in the configuration. The search base list is read
6bbd11
-at startup and whenever the daemon recieves a HUP signal.
6bbd11
-.TP
6bbd11
-.B map_object_class
6bbd11
-The map object class. In the \fBnisMap\fP schema this corresponds to the class
6bbd11
-\fBnisMap\fP and in the \fBautomountMap\fP schema it corresponds to the class
6bbd11
-\fBautomountMap\fP.
6bbd11
-.TP
6bbd11
-.B entry_object_class
6bbd11
-The map entry object class. In the \fBnisMap\fP schema this corresponds
6bbd11
-to the class \fBnisObject\fP and in the \fBautomountMap\fP schema it
6bbd11
-corresponds to the class \fBautomount\fP.
6bbd11
-.TP
6bbd11
-.B map_attribute
6bbd11
-The attribute used to identify the name of the map to which this
6bbd11
-entry belongs.  In the \fBnisMap\fP schema this corresponds to the attribute
6bbd11
-\fBnisMapName\fP and in the \fBautomountMap\fP schema it corresponds to the
6bbd11
-attribute \fBou\fP or \fBautomountMapName\fP.
6bbd11
-.TP
6bbd11
-.B entry_attribute
6bbd11
-The attribute used to identify a map key. In the \fBnisMap\fP schema this
6bbd11
-corresponds to the attribute \fBcn\fP and in the \fBautomountMap\fP schema
6bbd11
-it corresponds to the attribute \fBautomountKey\fP.
6bbd11
-.TP
6bbd11
-.B value_attribute
6bbd11
-The attribute used to identify the value of the map entry. In the \fBnisMap\fP
6bbd11
-schema this corresponds to the attribute \fBnisMapEntry\fP and in the \fBautomountMap\fP
6bbd11
-schema it corresponds to the attribute \fBautomountInformation\fP.
6bbd11
-.TP
6bbd11
-.B NOTE:
6bbd11
-It is essential that entries use class and attribute in a consistent
6bbd11
-manner for correct operation of autofs. For example mixing \fBcn\fP and
6bbd11
-\fBautomountKey\fP attributes in \fBautomount\fP schema map entries won't
6bbd11
-work as expected.
6bbd11
+.I amdMap
6bbd11
+.br
6bbd11
+The \fBamdmap\fP schema contains attributes \fBamdmapName\fP, \fBamdmapKey\fP
6bbd11
+and \fBamdmapValue\fP where \fBamdmapName\fP contains the name of the containing
6bbd11
+map, \fBamdmapKey\fP contains the map key and \fBamdmapValue\fP contains the
6bbd11
+map entry.
6bbd11
 .SH LDAP AUTHENTICATION, ENCRYPTED AND CERTIFIED CONNECTIONS
6bbd11
 LDAP authenticated binds, TLS encrypted connections and certification
6bbd11
 may be used by setting appropriate values in the autofs authentication
6bbd11
@@ -419,10 +287,6 @@ settings.  The default location of this file is
6bbd11
 .nh
6bbd11
 .BR @@autofsmapdir@@/autofs_ldap_auth.conf .
6bbd11
 .hy
6bbd11
-.TP
6bbd11
-.B auth_conf_file
6bbd11
-This configuration option may be used to specify an alternate location
6bbd11
-for the ldap authentication file
6bbd11
 .P
6bbd11
 If this file exists it will be used to establish whether TLS or authentication
6bbd11
 should be used.
6bbd11
@@ -458,7 +322,9 @@ in the per-user configuration. The location of these files and the configuration
6bbd11
 entry requirements is system dependent so the documentation for your
6bbd11
 installation will need to be consulted to get further information.
6bbd11
 .P
6bbd11
-See \fBautofs_ldap_auth.conf\fP(5) for more information.
6bbd11
+See
6bbd11
+.B autofs_ldap_auth.conf (5)
6bbd11
+for more information.
6bbd11
 .SH EXAMPLE
6bbd11
 .sp
6bbd11
 .RS +.2i
6bbd11
@@ -492,7 +358,8 @@ configuration will be used to locate the source of the map
6bbd11
 .SH "SEE ALSO"
6bbd11
 .BR automount (8),
6bbd11
 .BR autofs (5),
6bbd11
-.BR autofs (8).
6bbd11
+.BR autofs (8),
6bbd11
+.BR autofs.conf (5),
6bbd11
 .BR autofs_ldap_auth.conf (5)
6bbd11
 .SH AUTHOR
6bbd11
 This manual page was written by Christoph Lameter <chris@waterf.org>,
6bbd11
diff --git a/man/autofs.5 b/man/autofs.5
6bbd11
index c3a1611..81ae375 100644
6bbd11
--- a/man/autofs.5
6bbd11
+++ b/man/autofs.5
6bbd11
@@ -1,6 +1,5 @@
6bbd11
 .\" t
6bbd11
-.TH AUTOFS 5 "6 Apr 1998"
6bbd11
-.TH AUTOFS 5 "14 Jan 2000"
6bbd11
+.TH AUTOFS 5 "9 Feb 2014"
6bbd11
 .SH NAME
6bbd11
 autofs \- Format of the automounter maps
6bbd11
 .SH "DESCRIPTION"
6bbd11
@@ -10,14 +9,16 @@ the master map of the automounter (see
6bbd11
 These maps describe how file systems below the mount point of the map
6bbd11
 (given in the master map) are to be mounted.  This page describes the
6bbd11
 .B sun
6bbd11
-map format; if another map format is specified (e.g. \fBhesiod\fP),
6bbd11
+map format; if another map format, other than
6bbd11
+.B amd ,
6bbd11
+is specified (e.g. \fBhesiod\fP),
6bbd11
 this documentation does not apply.
6bbd11
 
6bbd11
 Indirect maps, except for the internal hosts map, can be changed on the fly
6bbd11
 and the automouter will recognize those changes on the next operation it
6bbd11
 performs on that map. Direct maps require a HUP signal be sent to the
6bbd11
 daemon to refresh their contents as does the master map.
6bbd11
-.SH "FORMAT"
6bbd11
+.SH "SUN FORMAT"
6bbd11
 This is a description of the text file format.  Other methods of specifying
6bbd11
 these files may exist.  All empty lines or lines beginning with # are
6bbd11
 ignored. The basic format of one line in such maps is:
6bbd11
@@ -245,10 +246,347 @@ Anything else is questionable and unsupported, but these variations will also wo
6bbd11
 .SH UNSUPPORTED
6bbd11
 This version of the automounter supports direct maps stored in FILE, NIS, NISPLUS
6bbd11
 and LDAP only.
6bbd11
+.P
6bbd11
+.SH "AMD FORMAT"
6bbd11
+This is a description of the text file format. Other methods of specifying
6bbd11
+mount map entries may be required for different map sources.  All empty
6bbd11
+lines or lines beginning with # are ignored. The basic format of one
6bbd11
+line in such maps is:
6bbd11
+.P
6bbd11
+.BR key\ location-list
6bbd11
+.TP
6bbd11
+.B key
6bbd11
+.br
6bbd11
+A \fBkey\fP is a path (or a single path component alone) that may end
6bbd11
+in the wildcard key, "*", or the wildcard key alone and must not begin
6bbd11
+with the "/" character.
6bbd11
+.TP
6bbd11
+.B location-list
6bbd11
+Following the \fBkey\fP is a mount \fBlocation-list\fP.
6bbd11
+.TP
6bbd11
+A \fBlocation-list\fP list has the following syntax:
6bbd11
+.TP
6bbd11
+.B location[\ location[\ ...\ ]]\ [||\ location[\ location[\ ...\ ]]
6bbd11
+.P
6bbd11
+A mount \fBlocation-list\fP can use the cut operator, \fB||\fP, to specify
6bbd11
+locations that should be tried if none of the locations to the left of it
6bbd11
+where selected for a mount attempt.
6bbd11
+
6bbd11
+A mount \fBlocation\fP consists of an optional colon seperated list
6bbd11
+of \fBselectors\fP, followed by a colon seperated list of \fBoption:=value\fP
6bbd11
+pairs.
6bbd11
+
6bbd11
+The \fBselectors\fP that may be used return a value or boolean result.
6bbd11
+Those that return a value may be to used with the comparison
6bbd11
+operators \fB==\fP and \fB!=\fP and those that return a boolean result
6bbd11
+may be negated with the \fB!\fP.
6bbd11
+
6bbd11
+For a \fBlocation\fP to be selected for a mount attempt all of its \fBselectors\fP
6bbd11
+must evaluate to true. If a \fBlocation\fP is selected for a mount attempt
6bbd11
+and succeeds the lookup is completed and returns success. If the mount
6bbd11
+attempt fails the proceedure continues with the next \fBlocation\fP until
6bbd11
+they have all been tried.
6bbd11
+
6bbd11
+In addition some \fBselectors\fP take no argumenets, some one argument
6bbd11
+and others optionally take two arguments.
6bbd11
+
6bbd11
+The \fBselectors\fP that take no arguments are:
6bbd11
+.RS
6bbd11
+.TP
6bbd11
+.B arch
6bbd11
+.br
6bbd11
+The machine architecture which, if not set in the confugration, is
6bbd11
+obtained using uname(2).
6bbd11
+.TP
6bbd11
+.B karch
6bbd11
+.br
6bbd11
+The machine kernel architecture which, if not set in the confugration,
6bbd11
+is obtained using uname(2).
6bbd11
+.TP
6bbd11
+.B os
6bbd11
+.br
6bbd11
+The operating system name, if not set in the confugration, is obtained
6bbd11
+using uname(2).
6bbd11
+.TP
6bbd11
+.B osver
6bbd11
+.br
6bbd11
+The operating system version, if not set in the confugration, is obtained
6bbd11
+using uname(2).
6bbd11
+.TP
6bbd11
+.B full_os
6bbd11
+.br
6bbd11
+The full operating system name, if not set in the confugration this selector
6bbd11
+has no value.
6bbd11
+.TP
6bbd11
+.B vendor
6bbd11
+.br
6bbd11
+The operating system vendor name, if not set in the confugration this selector
6bbd11
+has the value "unknown".
6bbd11
+.TP
6bbd11
+.B byte
6bbd11
+.br
6bbd11
+The endianess of the hardware.
6bbd11
+.TP
6bbd11
+.B cluster
6bbd11
+.br
6bbd11
+The name of the local cluster. It has a value only if it is set in the
6bbd11
+configuration.
6bbd11
+.TP
6bbd11
+.B autodir
6bbd11
+.br
6bbd11
+The base path under which external mounts are done if they are needed.
6bbd11
+Most mounts are done in place but some can't be and this is the base
6bbd11
+path under which those mounts will be done.
6bbd11
+.TP
6bbd11
+.B domain
6bbd11
+.br
6bbd11
+The local domain name. It is set to the value of the configuration
6bbd11
+option \fBsub_domain\fP. If sub_domain is not given in the configuration
6bbd11
+it is set to the domain part of the local host name, as given by
6bbd11
+gethostname(2).
6bbd11
+.TP
6bbd11
+.B host
6bbd11
+.br
6bbd11
+The local host name, without the domain part, as given by gethostname(2).
6bbd11
+.TP
6bbd11
+.B hostd
6bbd11
+.br
6bbd11
+The full host name. If \fBsub_domain\fP is given in the configuration
6bbd11
+this is set to the contatenation of \fBhost\fP and \fBsub_domain\fP deperated
6bbd11
+by a \fB.\fP. If \fBsub_domain\fP is not set in the configuration the value
6bbd11
+of \fBdomain\fP is used instead of \fBsub_domain\fP.
6bbd11
+.TP
6bbd11
+.B uid
6bbd11
+.br
6bbd11
+The numeric value of the uid of the user that first requested the mount. Note
6bbd11
+this is usual the same as that used by amd but can be different within autofs.
6bbd11
+.TP
6bbd11
+.B gid
6bbd11
+.br
6bbd11
+The numeric value of the gid of the user that first requested the mount. Note
6bbd11
+this is usual the same as that used by amd but can be different within autofs.
6bbd11
+.TP
6bbd11
+.B key
6bbd11
+.br
6bbd11
+The string value of the key being looked up.
6bbd11
+.TP
6bbd11
+.B map
6bbd11
+.br
6bbd11
+The string value of the map name used to lookup \fBkey\fPs.
6bbd11
+.TP
6bbd11
+.B path
6bbd11
+.br
6bbd11
+The string value of the full path to the mount being requested.
6bbd11
+.TP
6bbd11
+.B dollar
6bbd11
+.br
6bbd11
+Evaluates to the string "$".
6bbd11
+.RE
6bbd11
+.TP
6bbd11
+The \fBselectors\fP that take one argument are:
6bbd11
+.RS
6bbd11
+.TP
6bbd11
+.B in_network(network) ", " network(network) ", " netnumber(network) ", " wire(network)
6bbd11
+.br
6bbd11
+These \fBselectors\fP are all the same. \fBin_network()\fP is the
6bbd11
+preferred usage. The \fBnetwork\fP argument is an address (which may include
6bbd11
+a subnet mask) or network name. The function compares \fBnetwork\fP
6bbd11
+against each interface and returns true if \fBnetwork\fP belongs to
6bbd11
+the network the interface is connected to.
6bbd11
+.TP
6bbd11
+.B xhost(hostname)
6bbd11
+.br
6bbd11
+The \fBxhost()\fP selector compares \fBhostname\fP to the \fB${host}\fP
6bbd11
+and if it doesn't match it attempts to lookup the cannonical name
6bbd11
+of \fBhostname\fP and compares it to \f${host}\fP as well.
6bbd11
+.TP
6bbd11
+.B exists(filename)
6bbd11
+.br
6bbd11
+Returns true if \fBfilename\fP exits as determined by lstat(2).
6bbd11
+.TP
6bbd11
+.B true()
6bbd11
+.br
6bbd11
+Evaluates to true, the argument is ignored and may be empty.
6bbd11
+.TP
6bbd11
+.B false()
6bbd11
+.br
6bbd11
+Evaluates to false, the argument is ignored and may be empty.
6bbd11
+.RE
6bbd11
+.TP
6bbd11
+The \fBselectors\fP that take up to two arguments are:
6bbd11
+.RS
6bbd11
+.TP
6bbd11
+.B netgrp(netgroup[,hostname])
6bbd11
+.br
6bbd11
+The \fBnetgrp()\fP selector returns true if \fPhostname\fP is a member of
6bbd11
+the netgroup \fBnetgroup\fP. If \fBhostname\fP is not given \fB${host}\fP
6bbd11
+is used for the comparison.
6bbd11
+.TP
6bbd11
+.B netgrpd(netgroup[,hostname])
6bbd11
+.br
6bbd11
+The \fBnetgrpd()i\fP selector behaves the same as \fBnetgrp()\fP except
6bbd11
+that if \fBhostname\fP is not given \fB${hostd}\fP, the fully qualified
6bbd11
+hostname, is used instead of \fB${host}\fP.
6bbd11
+.RE
6bbd11
+.TP
6bbd11
+The \fBoptions\fP that may be used are:
6bbd11
+.RS
6bbd11
+.TP
6bbd11
+.B type
6bbd11
+.br
6bbd11
+This is the mount filesystem \fBtype\fP.
6bbd11
+It can have a value of
6bbd11
+.BR auto ", " link ", " linkx ", " host ", " lofs ", " ext2-4 ", "
6bbd11
+.BR xfs ", " nfs ", " nfsl " or " cdfs "."
6bbd11
+Other types that are not yet implemented or are not available iin autofs are
6bbd11
+.BR nfsx ", " lustre ", " jfs ", " program ", " cachefs " and " direct "."
6bbd11
+.TP
6bbd11
+.B maptype
6bbd11
+.br
6bbd11
+The \fBmaptype\fP option specifies the type of the map source and can
6bbd11
+have a value of \fBfile\fP, \fBnis\fP, \fBnisplus\fP, \fBexec\fP, \fBldap\fP
6bbd11
+or \fBhesiod\fP. Map sources either not yet implemented or not available in
6bbd11
+autofs are \fBsss\fP, \fBndbm\fP, \fBpasswd\fP and \fBunion\fP.
6bbd11
+.TP
6bbd11
+.B fs
6bbd11
+.br
6bbd11
+The option \fBfs\fP is used to specify the local filesystem. The meaning of
6bbd11
+this option (and whether or not it is used) is dependent on the mount
6bbd11
+filesystem \fBtype\fP.
6bbd11
+.TP
6bbd11
+.B rhost
6bbd11
+.br
6bbd11
+The remote host name for network mount requests.
6bbd11
+.TP
6bbd11
+.B rfs
6bbd11
+.br
6bbd11
+The remote host filesystem path for network mount requests.
6bbd11
+.TP
6bbd11
+.B dev
6bbd11
+.br
6bbd11
+Must resolve to the device file for local device mount
6bbd11
+requests.
6bbd11
+.TP
6bbd11
+.B sublink
6bbd11
+.br
6bbd11
+The \fBsublink\fP option is used to specify a subdirectory
6bbd11
+within the mount location to which this entry will point.
6bbd11
+.TP
6bbd11
+.B pref
6bbd11
+.br
6bbd11
+The \fBpref\fP option is used to specify a prefix that is
6bbd11
+prepended to the lookup key before looking up the map entry
6bbd11
+key.
6bbd11
+.TP
6bbd11
+.B opts
6bbd11
+.br
6bbd11
+The \fBopts\fP option is used to specify mount options to be
6bbd11
+used for the mount. If a "\fB-\fP" is given it is ignored.
6bbd11
+Options that may be used are dependend on the mount filesystem.
6bbd11
+.TP
6bbd11
+.B addopts
6bbd11
+.br
6bbd11
+The \fBaddopts\fP option is used to specify additional mount
6bbd11
+options used in addition to the default mount options for the
6bbd11
+mount location.
6bbd11
+.TP
6bbd11
+.B remopts
6bbd11
+.br
6bbd11
+The \fBaddopts\fP option is used to specify mount options used
6bbd11
+instead the options given in \fBopts\fP when the mount location
6bbd11
+is on a remote retwork.
6bbd11
+.RE
6bbd11
+.TP
6bbd11
+A number of \fBoptions\fP aren't available or aren't yet implemented
6bbd11
+within autofs, these are:
6bbd11
+.RS
6bbd11
+.TP
6bbd11
+.B cache
6bbd11
+.br
6bbd11
+The \fBcache option\fP isn't used by autofs. The map entry cache is
6bbd11
+continually updated and stale entries cleaned on re-load when map
6bbd11
+changes are detected so these configuration entries are not used.
6bbd11
+The \fBregex\fP map key matching is not implemented and may not be
6bbd11
+due to the potential overhead of the full map scans needed on every
6bbd11
+key lookup.
6bbd11
+.TP
6bbd11
+.B cachedir
6bbd11
+.br
6bbd11
+The \fBcachefs\fP filesystem is not available on Linux, a different
6bbd11
+implementation is used for caching network mounted file systems.
6bbd11
+.TP
6bbd11
+.B mount ", " unmount ", " umount
6bbd11
+.br
6bbd11
+These \fBoptions\fP are used by the amd \fBprogram\fP mount type which
6bbd11
+is not yet implemented.
6bbd11
+.TP
6bbd11
+.B delay
6bbd11
+.br
6bbd11
+This \fBoption\fP is not used by the autofs implementation and is ignored.
6bbd11
+.RE
6bbd11
+.BR
6bbd11
+.SH FEATURES
6bbd11
+.SS Key Matching
6bbd11
+The amd parser key matching is unusual.
6bbd11
+
6bbd11
+The key string to be looked up is constructed by prepending the prefix, if
6bbd11
+there is one.
6bbd11
+
6bbd11
+The resulting relative path string is matched by first trying the sting
6bbd11
+itself. If no match is found the last component of the key string is
6bbd11
+replaced with the wilcard match cahracter ("*") and a wildcard match is
6bbd11
+attemted. This process continues until a match is found or until the
6bbd11
+last match, against the wilcard match key alone, fails to match a map
6bbd11
+entry and the key lookup fails.
6bbd11
+.SS Macro Usage
6bbd11
+Macros are used a lot in the autofs amd implementation.
6bbd11
+
6bbd11
+Many of the option values are set as macro variables corresponding to the
6bbd11
+option name during the map entry parse. So they may be used in subsequent
6bbd11
+option values. Beware though, the order in which option values is not
6bbd11
+necessarily left to right so you may get unexpected results.
6bbd11
+.BR
6bbd11
+.SH EXAMPLE
6bbd11
+Example NFS mount map:
6bbd11
+.P
6bbd11
+Assuming we have the autofs master map entry:
6bbd11
+.sp
6bbd11
+.RS +.2i
6bbd11
+.ta 1.0i 3.0i
6bbd11
+.nf
6bbd11
+/test	file,amd:/etc/amd.test
6bbd11
+.fi
6bbd11
+.RE
6bbd11
+.sp
6bbd11
+And the following map in /etc/amd.test:
6bbd11
+.sp
6bbd11
+.RS +.2i
6bbd11
+.ta 1.0i 3.0i
6bbd11
+.nf
6bbd11
+/defaults	type:=nfs;rhost:=bilbo
6bbd11
+apps	rfs:=/autofs
6bbd11
+util	rhost:=zeus;rfs:=/work/util
6bbd11
+local	rfs:=/shared;sublink:=local
6bbd11
+.fi
6bbd11
+.RE
6bbd11
+.sp
6bbd11
+In the first line we have an NFS remote mount of the exported directory
6bbd11
+/autofs from host bilbo which would be mounted on /test/apps. Next
6bbd11
+another nfs mount for the exported directory /work/util from host zeus.
6bbd11
+This would be mounted on /test/util.
6bbd11
+
6bbd11
+Finally we have an example of the use of the \fBsublink\fP option. In
6bbd11
+this case the filesystem bilbo:/shared would be mounted on a path
6bbd11
+external the automount directory (under the direcory given by
6bbd11
+configuration option auto_dir) and the path /test/local either
6bbd11
+symlinked or bind mounted (depending on the setting autofs_use_lofs)
6bbd11
+to the "local" subdirectory of the external mount.
6bbd11
+.BR
6bbd11
 .SH "SEE ALSO"
6bbd11
 .BR automount (8),
6bbd11
 .BR auto.master (5),
6bbd11
 .BR autofs (8),
6bbd11
+.BR autofs.conf (5),
6bbd11
 .BR mount (8).
6bbd11
 .BR autofs_ldap_auth.conf (5)
6bbd11
 .SH AUTHOR
6bbd11
diff --git a/man/autofs.8.in b/man/autofs.8.in
6bbd11
index fae0b00..7ab4242 100644
6bbd11
--- a/man/autofs.8.in
6bbd11
+++ b/man/autofs.8.in
6bbd11
@@ -49,6 +49,7 @@ will display the status of,
6bbd11
 .SH "SEE ALSO"
6bbd11
 .BR automount (8),
6bbd11
 .BR autofs (5),
6bbd11
+.BR autofs.conf (5),
6bbd11
 .BR auto.master (5).
6bbd11
 .BR autofs_ldap_auth.conf (5)
6bbd11
 .SH AUTHOR
6bbd11
diff --git a/man/autofs.conf.5.in b/man/autofs.conf.5.in
6bbd11
new file mode 100644
6bbd11
index 0000000..aad4143
6bbd11
--- /dev/null
6bbd11
+++ b/man/autofs.conf.5.in
6bbd11
@@ -0,0 +1,412 @@
6bbd11
+.\" t
6bbd11
+.TH AUTOFS.CONF "23 Jan 2014"
6bbd11
+.SH NAME
6bbd11
+autofs.conf \- autofs configuration
6bbd11
+.SH "DESCRIPTION"
6bbd11
+.P
6bbd11
+Configuration settings used by
6bbd11
+.BR automount (8)
6bbd11
+may be changed in the configuration file \fB@@autofsmapdir@@/autofs.conf\fP.
6bbd11
+.P
6bbd11
+This file contains two primary sections, \fBautofs\fP and \fBamd\fP.
6bbd11
+.P
6bbd11
+Configuration entries may be present at the beginning of the
6bbd11
+configuration file without a section header and are implicitly
6bbd11
+included as part of the \fBautofs\fP section.
6bbd11
+.P
6bbd11
+Each section name is enclosed in square brackets with
6bbd11
+spaces between the brackets and the section name. The \fBamd\fP
6bbd11
+section may be followed by further sections, named by the
6bbd11
+top level mount point path, that contain per mount
6bbd11
+configuration settings.
6bbd11
+.SH "SECTION autofs CONFIGURATION OPTIONS"
6bbd11
+.P
6bbd11
+Configuration settings available are:
6bbd11
+.TP
6bbd11
+.B timeout
6bbd11
+.br
6bbd11
+Sets the default mount timeout in seconds. The internal program
6bbd11
+default is 10 minutes, but the default installed configuration
6bbd11
+overrides this and sets the timeout to 5 minutes to be consistent
6bbd11
+with earlier autofs releases.
6bbd11
+.TP
6bbd11
+.B negative_timeout
6bbd11
+.br
6bbd11
+Set the default timeout for caching failed key lookups (program default
6bbd11
+60). If the equivalent command line option is given it will override this
6bbd11
+setting.
6bbd11
+.TP
6bbd11
+.B mount_wait
6bbd11
+.br
6bbd11
+Set the default time to wait for a response from a spawned mount(8)
6bbd11
+before sending it a SIGTERM. Note that we still need to wait for the
6bbd11
+RPC layer to timeout before the sub-process exits so this isn't ideal
6bbd11
+but it is the best we can do. The default is to wait until mount(8)
6bbd11
+returns without intervention.
6bbd11
+.TP
6bbd11
+.B umount_wait
6bbd11
+.br
6bbd11
+Set the default time to wait for a response from a spawned umount(8)
6bbd11
+before sending it a SIGTERM. Note that we still need to wait for the
6bbd11
+RPC layer to timeout before the sub-process exits so this isn't ideal
6bbd11
+but it is the best we can do.
6bbd11
+.TP
6bbd11
+.B browse_mode
6bbd11
+.br
6bbd11
+Maps are browsable by default (program default "yes").
6bbd11
+.TP
6bbd11
+.B mount_nfs_default_protocol
6bbd11
+.br
6bbd11
+Specify the default protocol used by
6bbd11
+.BR mount.nfs (8)
6bbd11
+(program default 3). Since we can't identify this default automatically
6bbd11
+we need to set it in the autofs configuration.
6bbd11
+.TP
6bbd11
+.B append_options
6bbd11
+.br
6bbd11
+Determine whether global options, given on the command line or per mount
6bbd11
+in the master map, are appended to map entry options or if the map entry
6bbd11
+options replace the global options (program default "yes", append options).
6bbd11
+.TP
6bbd11
+.B logging
6bbd11
+.br
6bbd11
+set default log level "none", "verbose" or "debug" (program default "none").
6bbd11
+.SS LDAP Configuration
6bbd11
+.P
6bbd11
+Configuration settings available are:
6bbd11
+.TP
6bbd11
+.B ldap_timeout
6bbd11
+.br
6bbd11
+Set the network response timeout (default 8).
6bbd11
+Set timeout value for the synchronous API  calls. The default is the LDAP
6bbd11
+library default of an infinite timeout.
6bbd11
+.TP
6bbd11
+.B ldap_network_timeout
6bbd11
+.br
6bbd11
+Set the network response timeout (default 8).
6bbd11
+.TP
6bbd11
+.B ldap_uri
6bbd11
+.br
6bbd11
+A space seperated list of server uris of the form <proto>://<server>[/]
6bbd11
+where <proto> can be ldap or ldaps. The option can be given multiple times.
6bbd11
+Map entries that include a server name override this option and it is then
6bbd11
+not used. Default is an empty list in which case either the server given
6bbd11
+in a map entry or the LDAP configured default is used. This uri list is read at
6bbd11
+startup and whenever the daemon receives a HUP signal.
6bbd11
+
6bbd11
+This configuration option can also be used to request autofs lookup SRV RRs
6bbd11
+for a domain of the form <proto>:///[<domain dn>]. Note that a trailing
6bbd11
+"/" is not allowed when using this form. If the domain dn is not specified
6bbd11
+the dns domain name (if any) is used to construct the domain dn for the
6bbd11
+SRV RR lookup. The server list returned from an SRV RR lookup is refreshed
6bbd11
+according to the minimum ttl found in the SRV RR records or after one hour,
6bbd11
+whichever is less.
6bbd11
+.TP
6bbd11
+.B search_base
6bbd11
+.br
6bbd11
+The base dn to use when searching for amap base dn. This entry may be
6bbd11
+given multiple times and each will be checked for a map base dn in
6bbd11
+the order they occur in the configuration. The search base list is read
6bbd11
+at startup and whenever the daemon recieves a HUP signal.
6bbd11
+.TP
6bbd11
+.B map_object_class
6bbd11
+.br
6bbd11
+The map object class. In the \fBnisMap\fP schema this corresponds to the class
6bbd11
+\fBnisMap\fP and in the \fBautomountMap\fP schema it corresponds to the class
6bbd11
+\fBautomountMap\fP.
6bbd11
+.TP
6bbd11
+.B entry_object_class
6bbd11
+.br
6bbd11
+The map entry object class. In the \fBnisMap\fP schema this corresponds
6bbd11
+to the class \fBnisObject\fP and in the \fBautomountMap\fP schema it
6bbd11
+corresponds to the class \fBautomount\fP.
6bbd11
+.TP
6bbd11
+.B map_attribute
6bbd11
+.br
6bbd11
+The attribute used to identify the name of the map to which this
6bbd11
+entry belongs.  In the \fBnisMap\fP schema this corresponds to the attribute
6bbd11
+\fBnisMapName\fP and in the \fBautomountMap\fP schema it corresponds to the
6bbd11
+attribute \fBou\fP or \fBautomountMapName\fP.
6bbd11
+.TP
6bbd11
+.B entry_attribute
6bbd11
+.br
6bbd11
+The attribute used to identify a map key. In the \fBnisMap\fP schema this
6bbd11
+corresponds to the attribute \fBcn\fP and in the \fBautomountMap\fP schema
6bbd11
+it corresponds to the attribute \fBautomountKey\fP.
6bbd11
+.TP
6bbd11
+.B value_attribute
6bbd11
+.br
6bbd11
+The attribute used to identify the value of the map entry. In the \fBnisMap\fP
6bbd11
+schema this corresponds to the attribute \fBnisMapEntry\fP and in the \fBautomountMap\fP
6bbd11
+schema it corresponds to the attribute
6bbd11
+.BR automountInformation .
6bbd11
+.TP
6bbd11
+.B NOTE:
6bbd11
+It is essential that entries use class and attribute in a consistent
6bbd11
+manner for correct operation of autofs. For example mixing \fBcn\fP
6bbd11
+and \fBautomountKey\fP attributes in \fBautomount\fP schema will
6bbd11
+not work as expected.
6bbd11
+.TP
6bbd11
+.B auth_conf_file
6bbd11
+This configuration option may be used to specify an alternate location
6bbd11
+for the ldap authentication configuration file. See
6bbd11
+.BR autofs_ldap_auth.conf (5)
6bbd11
+for more information.
6bbd11
+.SH "SECTION amd CONFIGURATION OPTIONS"
6bbd11
+.P
6bbd11
+A number of the amd configuration options are not used by autofs,
6bbd11
+some because they are not relevant within autofs, some because
6bbd11
+they are done differently in autofs and others that are not yet
6bbd11
+implemented.
6bbd11
+
6bbd11
+Since \fBmount_type\fP is always autofs (because there's no user space
6bbd11
+NFS server) the configuration entries relating to that aren't used.
6bbd11
+Also, server availability is done differently within autofs so the
6bbd11
+options that relate to the amd server monitoring sub-system are
6bbd11
+also not used.
6bbd11
+
6bbd11
+These options are \fBmount_type\fP, \fBauto_attrcache\fP, \fBportmap_program\fP,
6bbd11
+\fBnfs_vers_ping\fP, \fBnfs_allow_any_interface\fP, \fBnfs_allow_insecure_port\fP,
6bbd11
+\fBnfs_proto\fP, \fBnfs_retransmit_counter\fP, \fBnfs_retransmit_counter_udp\fP,
6bbd11
+\fBnfs_retransmit_counter_tcp\fP, \fBnfs_retransmit_counter_toplvl\fP,
6bbd11
+\fBnfs_retry_interval\fP, \fBnfs_retry_interval_udp\fP, \fBnfs_retry_interval_tcp\fP,
6bbd11
+\fBnfs_retry_interval_toplvl\fP and \fBnfs_vers\fP.
6bbd11
+
6bbd11
+Other options that are not used within the autofs implementation:
6bbd11
+.TP
6bbd11
+.BR log_file ", " truncate_log
6bbd11
+.br autofs used either stderr when running in the foreground or
6bbd11
+sends its output to syslog so an alternate log file (or truncating
6bbd11
+the log) can't be used.
6bbd11
+.TP
6bbd11
+.B print_pid
6bbd11
+.br
6bbd11
+There's no corresponding option for this within autofs.
6bbd11
+.TP
6bbd11
+.BR use_tcpwrappers ", " show_statfs_entries
6bbd11
+.br
6bbd11
+There's no user space NFS server to control access to so this
6bbd11
+option isn't relevant. The show_statfs_entries can't be
6bbd11
+implemented for the same reason.
6bbd11
+.TP
6bbd11
+.B debug_mtab_file
6bbd11
+.br
6bbd11
+There's no user space NFS server and autofs avoids using file
6bbd11
+based mtab whenever possible.
6bbd11
+.TP
6bbd11
+.B sun_map_syntax
6bbd11
+.br
6bbd11
+Sun map format is handled by autofs itself.
6bbd11
+.TP
6bbd11
+.BR plock ", " show_statfs_entries ", " preferred_amq_port
6bbd11
+.br
6bbd11
+Are not supported by autofs.
6bbd11
+.TP
6bbd11
+.BR ldap_cache_maxmem ", " ldap_cache_seconds
6bbd11
+.br
6bbd11
+External ldap caching is not used by autofs.
6bbd11
+.TP
6bbd11
+.B ldap_proto_version
6bbd11
+.br
6bbd11
+autofs always attempts to use the highest available ldap
6bbd11
+protocol version.
6bbd11
+.TP
6bbd11
+.BR cache_duration ", " map_reload_interval ", " map_options
6bbd11
+.br
6bbd11
+The map	entry cache is continually updated and stale entries
6bbd11
+cleaned on re-load, which is done when map changes aredetected
6bbd11
+so these configuration entries are not used by autofs.
6bbd11
+.TP
6bbd11
+.B localhost_address
6bbd11
+This is not used within autofs. This configuration option was
6bbd11
+only used in the amd user space server code and is not relevant
6bbd11
+within autofs.
6bbd11
+.P
6bbd11
+Options that are handled differently within autofs:
6bbd11
+.TP
6bbd11
+.B pid_file
6bbd11
+.br
6bbd11
+To specify a pid file name a command line option must be used on startup.
6bbd11
+.TP
6bbd11
+.B print_version
6bbd11
+.br
6bbd11
+Program version and feature information is obtained by using the
6bbd11
+automount command line option "-V".
6bbd11
+.TP
6bbd11
+.B debug_options ", " log_options
6bbd11
+.br
6bbd11
+autofs has somewhat more limited logging and debug logging options.
6bbd11
+When the log_options options is encountered it is converted to the
6bbd11
+nearest matching autofs logging option. Since the configuration
6bbd11
+option debug_options would be handled the same way it is ignored.
6bbd11
+.TP
6bbd11
+.B restart_mounts
6bbd11
+.br
6bbd11
+This option has no sensible meaning within autofs because autofs
6bbd11
+always tries to re-connect to existing mounts. While this has its
6bbd11
+own set of problems not re-connecting to existing mounts always
6bbd11
+results in a non-functional automount tree if mounts were busy at
6bbd11
+the last shutdown (as is also the case with amd when using
6bbd11
+mount_type autofs).
6bbd11
+.TP
6bbd11
+.B forced_unmounts
6bbd11
+.br
6bbd11
+Detaching mounts often causes serious problems for users of
6bbd11
+existing mounts. It is used by autofs in some cases, either at
6bbd11
+the explicit request of the user (with a command line or init
6bbd11
+option) and in some special cases during program operation but
6bbd11
+is avoided whenever possible.
6bbd11
+.P
6bbd11
+A number of configuration options are not yet implemented:
6bbd11
+.TP
6bbd11
+.B search_path
6bbd11
+.br
6bbd11
+Always a little frustrating, the compiled in map location should
6bbd11
+be used to locate maps but isn't in some cases. This requires
6bbd11
+work within autofs itself and that will (obviously) include
6bbd11
+implementing this configuration option for the amd map parser
6bbd11
+as well.
6bbd11
+.TP
6bbd11
+.B fully_qualified_hosts
6bbd11
+Not yet implemented.
6bbd11
+.TP
6bbd11
+.B unmount_on_exit
6bbd11
+.br
6bbd11
+Since autofs always tries to re-connect to mounts left mounted
6bbd11
+from a previous shutdown this is a sensible option to implement
6bbd11
+and that will be done.
6bbd11
+.TP
6bbd11
+.B browsable_dirs
6bbd11
+.br
6bbd11
+Not yet implemented.
6bbd11
+.TP
6bbd11
+.B exec_map_timeout
6bbd11
+.br
6bbd11
+A timeout is not currently used for for program maps, might be
6bbd11
+implemented.
6bbd11
+.TP
6bbd11
+.B tag
6bbd11
+.br
6bbd11
+The tag option is not implemented within autofs.
6bbd11
+.P
6bbd11
+Supported options:
6bbd11
+.TP
6bbd11
+.BR arch ", " karch ", " os ", " osver
6bbd11
+.br
6bbd11
+These options default to what is returned from uname(2) and can
6bbd11
+be overridden if required.
6bbd11
+.TP
6bbd11
+.B full_os
6bbd11
+This option has no default and must be set in the configuration
6bbd11
+if used in maps.
6bbd11
+.TP
6bbd11
+.B cluster
6bbd11
+.br
6bbd11
+If not set defaults to the host domain name. This option corresponds
6bbd11
+to the HP_UX cluster name (according to the amd source) and is
6bbd11
+probably not used in Linux but is set anyway.
6bbd11
+.TP
6bbd11
+.B vendor
6bbd11
+This option has a default value of "unknown", it must be set in the
6bbd11
+configuration if used in maps.
6bbd11
+.TP
6bbd11
+.B auto_dir
6bbd11
+.br
6bbd11
+Is the base name of the mount tree used for external mounts that
6bbd11
+are sometimes needed by amd maps. Its default value is "/a".
6bbd11
+.TP
6bbd11
+.B map_type
6bbd11
+.br
6bbd11
+Specifies the autofs map source, such as file, nis, ldap etc. and
6bbd11
+has no default value set.
6bbd11
+.TP
6bbd11
+.B map_defaults
6bbd11
+.br
6bbd11
+This option is used to override /defaults entries within maps
6bbd11
+and can be used to provide different defaults on specific machines
6bbd11
+without having to modify centrally managed maps. It is empty by
6bbd11
+default.
6bbd11
+.TP
6bbd11
+.B dismount_interval
6bbd11
+.br
6bbd11
+Is equivalent to the autofs timeout option. It is only possible
6bbd11
+to use this with type "auto" mounts due to the way the autofs
6bbd11
+kernel module performs expiry. It takes its default value from
6bbd11
+the autofs internal defaulti of 600 seconds.
6bbd11
+.TP
6bbd11
+.B autofs_use_lofs
6bbd11
+.br
6bbd11
+If set to "yes" autofs will attempt to use bind mounts for type
6bbd11
+"auto" when possible.
6bbd11
+.TP
6bbd11
+.B nis_domain
6bbd11
+.br
6bbd11
+Allows setting of a domain name other than the system default.
6bbd11
+.TP
6bbd11
+.B local_domain
6bbd11
+.br
6bbd11
+Is used to override (or set) the host domain name.
6bbd11
+.TP
6bbd11
+.B normalize_hostnames
6bbd11
+.br
6bbd11
+If set to "yes" then the contents of ${rhost} is translated in
6bbd11
+its official host name.
6bbd11
+.TP
6bbd11
+.B domain_strip
6bbd11
+.br
6bbd11
+If set to "yes" the domain name part of the host is strippped
6bbd11
+when normalizing hostnames. This can be useful when using of
6bbd11
+the same maps in a multiple domain environment.
6bbd11
+.TP
6bbd11
+.B normalize_slashes
6bbd11
+.br
6bbd11
+This option is set to "yes" by default and will collapse
6bbd11
+multiple unescaped occurrences of "/" to a single "/".
6bbd11
+.TP
6bbd11
+.BR selectors_in_defaults ", " selectors_on_default
6bbd11
+.br
6bbd11
+This option has a default value of "no". If set to "yes" then
6bbd11
+any defaults entry will be checked for selectors to determine
6bbd11
+the values to be used. selectors_in_defaults is the preferred
6bbd11
+option to use.
6bbd11
+.TP
6bbd11
+.B ldap_base
6bbd11
+.br
6bbd11
+iThis option has no default value. It must be set to the base dn
6bbd11
+that is used for queries if ldap is to be used as a map source.
6bbd11
+.TP
6bbd11
+.B ldap_hostports
6bbd11
+.br
6bbd11
+This option has no default value set. It must be set to the URI
6bbd11
+of the LDAP server to be used for lookups wheni ldap is used a
6bbd11
+map source. It may contain a comma or space seperated list of
6bbd11
+LDAP URIs.
6bbd11
+.TP
6bbd11
+.B hesiod_base
6bbd11
+.br
6bbd11
+Sets the base name used for hesiod map sources.
6bbd11
+.SH EXAMPLE
6bbd11
+.sp
6bbd11
+.RS +.2i
6bbd11
+.ta 1.0i
6bbd11
+.nf
6bbd11
+[ autofs ]
6bbd11
+timeout = 300
6bbd11
+browse_mode = no
6bbd11
+
6bbd11
+[ amd ]
6bbd11
+dismount_interval = 300
6bbd11
+map_type = nis
6bbd11
+autofs_use_lofs = no
6bbd11
+
6bbd11
+[ /expamle/mount ]
6bbd11
+dismount_interval = 60
6bbd11
+map_type = file
6bbd11
+.fi
6bbd11
+.RE
6bbd11
+.SH "SEE ALSO"
6bbd11
+.BR automount (8),
6bbd11
+.BR auto.master (5),
6bbd11
+.BR autofs_ldap_auth.conf (5)
6bbd11
+.SH AUTHOR
6bbd11
+This manual page was written by Ian Kent <raven@themaw.net>.
6bbd11
diff --git a/man/autofs_ldap_auth.conf.5.in b/man/autofs_ldap_auth.conf.5.in
6bbd11
index fa23ce5..fe5077d 100644
6bbd11
--- a/man/autofs_ldap_auth.conf.5.in
6bbd11
+++ b/man/autofs_ldap_auth.conf.5.in
6bbd11
@@ -113,5 +113,6 @@ externally configured credential cache that is used during authentication.
6bbd11
 By default, autofs will setup a memory based credential cache.
6bbd11
 .SH "SEE ALSO"
6bbd11
 .BR auto.master (5),
6bbd11
+.BR autofs.conf (5),
6bbd11
 .SH AUTHOR
6bbd11
 This manual page was written by Ian Kent <raven@themaw.net>.
6bbd11
diff --git a/man/automount.8 b/man/automount.8
6bbd11
index 79e53f0..130b24c 100644
6bbd11
--- a/man/automount.8
6bbd11
+++ b/man/automount.8
6bbd11
@@ -172,6 +172,7 @@ constructed has been detached from the mount tree.
6bbd11
 .SH "SEE ALSO"
6bbd11
 .BR autofs (5),
6bbd11
 .BR autofs (8),
6bbd11
+.BR autofs.conf (5),
6bbd11
 .BR auto.master (5),
6bbd11
 .BR mount (8).
6bbd11
 .BR autofs_ldap_auth.conf (5)