diff --git a/INSTALL b/INSTALL index 6cfd6e12b..64c9ed262 100644 --- a/INSTALL +++ b/INSTALL @@ -180,22 +180,22 @@ Special features/options: containing the LDAP include and lib directories. Please see README.LDAP for more information. - --with-ldap-conf-file=filename + --with-ldap-conf-file=PATH Path to LDAP configuration file. If specified, sudo reads this file instead of /etc/ldap.conf to locate the LDAP server. - --with-ldap-secret-file=filename + --with-ldap-secret-file=PATH Path to LDAP secret password file. If specified, sudo uses this file instead of /etc/ldap.secret to read the secret password when rootbinddn is specified in the ldap config file. - --with-nsswitch[=filename] + --with-nsswitch[=PATH] Path to nsswitch.conf or "no" to disable nsswitch support. If specified, sudo uses this file instead of /etc/nsswitch.conf. If nsswitch is disabled but LDAP is enabled, sudo will check LDAP first, then the sudoers file. - --with-netsvc[=filename] + --with-netsvc[=PATH] Path to netsvc.conf or "no" to disable netsvc.conf support. If specified, sudo uses this file instead of /etc/netsvc.conf on AIX systems. @@ -258,7 +258,7 @@ Special features/options: another program (think shell escapes). Please see the "PREVENTING SHELL ESCAPES" section in the sudoers man page for details. If specified, PATH should be a fully qualified - pathname, e.g. /usr/local/libexec/sudo_noexec.so. If PATH + path name, e.g. /usr/local/libexec/sudo_noexec.so. If PATH is "no", noexec support will not be compiled in. The default is to compile noexec support if libtool supports building shared objects on your OS. @@ -529,7 +529,7 @@ The following options are also configurable at runtime: --with-editor=PATH Specify the default editor path for use by visudo. This may be a - single pathname or a colon-separated list of editors. In the latter + single path name or a colon-separated list of editors. In the latter case, visudo will choose the editor that matches the user's VISUAL or EDITOR environment variables or the first editor in the list that exists. The default is the path to vi on your system. diff --git a/README.LDAP b/README.LDAP index 85f05f549..2a7e51f46 100644 --- a/README.LDAP +++ b/README.LDAP @@ -151,8 +151,8 @@ Configure your /etc/ldap.conf and /etc/nsswitch.conf ==================================================== The /etc/ldap.conf file is meant to be shared between sudo, pam_ldap, nss_ldap and other ldap applications and modules. IBM Secureway unfortunately uses -the same filename but has a different syntax. If you need to rename where -this file is stored, re-run configure with the --with-ldap-conf-file=filename +the same file name but has a different syntax. If you need to change where +this file is stored, re-run configure with the --with-ldap-conf-file=PATH option. See the "Configuring ldap.conf" section in the sudoers.ldap manual diff --git a/sudoers.pod b/sudoers.pod index 3b822bbed..b38ed6567 100644 --- a/sudoers.pod +++ b/sudoers.pod @@ -195,9 +195,9 @@ wildcards to be useful. Cmnd_List ::= Cmnd | Cmnd ',' Cmnd_List - commandname ::= filename | - filename args | - filename '""' + commandname ::= file name | + file name args | + file name '""' Cmnd ::= '!'* commandname | '!'* directory | @@ -205,9 +205,9 @@ wildcards to be useful. '!'* Cmnd_Alias A C is a list of one or more commandnames, directories, and other -aliases. A commandname is a fully qualified filename which may include +aliases. A commandname is a fully qualified file name which may include shell-style wildcards (see the L section below). A simple -filename allows the user to run the command with any arguments he/she +file name allows the user to run the command with any arguments he/she wishes. However, you may also specify command line arguments (including wildcards). Alternately, you can specify C<""> to indicate that the command may only be run B command line arguments. A directory is a @@ -448,7 +448,7 @@ escaped. For example: /bin/ls [[\:alpha\:]]* -Would match any filename beginning with a letter. +Would match any file name beginning with a letter. Note that a forward slash ('/') will B be matched by wildcards used in the pathname. When matching the command @@ -499,7 +499,7 @@ F will be processed. Files that are included may themselves include other files. A hard limit of 128 nested include files is enforced to prevent include file loops. -The filename may include the C<%h> escape, signifying the short form +The file name may include the C<%h> escape, signifying the short form of the hostname. I.e., if the machine's hostname is "xerxes", then C<#include /etc/sudoers.%h>