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

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