From: Todd C. Miller Date: Thu, 7 Feb 2013 19:08:54 +0000 (-0500) Subject: Mention line continuation X-Git-Tag: SUDO_1_8_7~1^2~241 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74881843e1a5db0725c72adfa1d5a09a08903054;p=sudo Mention line continuation --- diff --git a/doc/sudo.conf.cat b/doc/sudo.conf.cat index fa52c8b2d..c71b33ac2 100644 --- a/doc/sudo.conf.cat +++ b/doc/sudo.conf.cat @@ -23,6 +23,10 @@ DDEESSCCRRIIPPTTIIOONN The pound sign (`#') is used to indicate a comment. Both the comment character and any text after it, up to the end of the line, are ignored. + Long lines can be continued with a backslash (`\') as the last character + on the line. Note that leading white space is removed from the beginning + of lines even when the continuation character is used. + Non-comment lines that don't begin with Plugin, Path, Debug, or Set are silently ignored. @@ -38,14 +42,14 @@ DDEESSCCRRIIPPTTIIOONN and the _p_a_t_h to the shared object containing the plugin. The _s_y_m_b_o_l___n_a_m_e is the name of the struct policy_plugin or struct io_plugin in the plugin shared object. The _p_a_t_h may be fully qualified or relative. If not - fully qualified, it is relative to the _/_u_s_r_/_l_o_c_a_l_/_l_i_b_e_x_e_c directory. In - other words: + fully qualified, it is relative to the _/_u_s_r_/_l_o_c_a_l_/_l_i_b_e_x_e_c_/_s_u_d_o directory. + In other words: Plugin sudoers_policy sudoers.so is equivalent to: - Plugin sudoers_policy /usr/local/libexec/sudoers.so + Plugin sudoers_policy /usr/local/libexec/sudo/sudoers.so Starting with ssuuddoo 1.8.5, any additional parameters after the _p_a_t_h are passed as arguments to the plugin's _o_p_e_n function. For example, to @@ -73,7 +77,7 @@ DDEESSCCRRIIPPTTIIOONN A Path line consists of the Path keyword, followed by the name of the path to set and its value. For example: - Path noexec /usr/local/libexec/sudo_noexec.so + Path noexec /usr/local/libexec/sudo/sudo_noexec.so Path askpass /usr/X11R6/bin/ssh-askpass The following plugin-agnostic paths may be set in the _/_e_t_c_/_s_u_d_o_._c_o_n_f @@ -93,7 +97,7 @@ DDEESSCCRRIIPPTTIIOONN functions that just return an error. This is used to implement the _n_o_e_x_e_c functionality on systems that support LD_PRELOAD or its equivalent. The default value is: - _/_u_s_r_/_l_o_c_a_l_/_l_i_b_e_x_e_c_/_s_u_d_o___n_o_e_x_e_c_._s_o. + _/_u_s_r_/_l_o_c_a_l_/_l_i_b_e_x_e_c_/_s_u_d_o_/_s_u_d_o___n_o_e_x_e_c_._s_o. OOtthheerr sseettttiinnggss The ssuuddoo..ccoonnff file also supports the following front end settings: @@ -242,7 +246,7 @@ EEXXAAMMPPLLEESS # Debug sudo /var/log/sudo_debug all@warn # Set disable_coredump true # - # The plugin_path is relative to /usr/local/libexec unless + # The plugin_path is relative to /usr/local/libexec/sudo unless # fully qualified. # The plugin_name corresponds to a global symbol in the plugin # that contains the plugin interface structure. @@ -276,7 +280,7 @@ EEXXAAMMPPLLEESS # The compiled-in value is usually sufficient and should only be # changed if you rename or move the sudo_noexec.so file. # - #Path noexec /usr/local/libexec/sudo_noexec.so + #Path noexec /usr/local/libexec/sudo/sudo_noexec.so # # Core dumps: @@ -338,4 +342,4 @@ DDIISSCCLLAAIIMMEERR file distributed with ssuuddoo or http://www.sudo.ws/sudo/license.html for complete details. -Sudo 1.8.7 February 6, 2013 Sudo 1.8.7 +Sudo 1.8.7 February 7, 2013 Sudo 1.8.7 diff --git a/doc/sudo.conf.man.in b/doc/sudo.conf.man.in index 333e7bf9b..ac76e7cbb 100644 --- a/doc/sudo.conf.man.in +++ b/doc/sudo.conf.man.in @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.TH "SUDO" "5" "February 6, 2013" "Sudo @PACKAGE_VERSION@" "OpenBSD Programmer's Manual" +.TH "SUDO" "5" "February 7, 2013" "Sudo @PACKAGE_VERSION@" "OpenBSD Programmer's Manual" .nh .if n .ad l .SH "NAME" @@ -62,6 +62,12 @@ is used to indicate a comment. Both the comment character and any text after it, up to the end of the line, are ignored. .PP +Long lines can be continued with a backslash +(`\e') +as the last character on the line. +Note that leading white space is removed from the beginning of lines +even when the continuation character is used. +.PP Non-comment lines that don't begin with \fRPlugin\fR, \fRPath\fR, diff --git a/doc/sudo.conf.mdoc.in b/doc/sudo.conf.mdoc.in index b040cd54d..6e536f90e 100644 --- a/doc/sudo.conf.mdoc.in +++ b/doc/sudo.conf.mdoc.in @@ -14,7 +14,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 6, 2013 +.Dd February 7, 2013 .Dt SUDO @mansectform@ .Os Sudo @PACKAGE_VERSION@ .Sh NAME @@ -58,6 +58,12 @@ is used to indicate a comment. Both the comment character and any text after it, up to the end of the line, are ignored. .Pp +Long lines can be continued with a backslash +.Pq Ql \e +as the last character on the line. +Note that leading white space is removed from the beginning of lines +even when the continuation character is used. +.Pp Non-comment lines that don't begin with .Li Plugin , .Li Path , diff --git a/doc/sudoers.cat b/doc/sudoers.cat index c505d80df..431ee25ca 100644 --- a/doc/sudoers.cat +++ b/doc/sudoers.cat @@ -1393,8 +1393,8 @@ SSUUDDOOEERRSS OOPPTTIIOONNSS arguments. This can be used to implement support for the nonunix_group syntax described earlier. The string should consist of the plugin path, either fully-qualified or - relative to the _/_u_s_r_/_l_o_c_a_l_/_l_i_b_e_x_e_c directory, followed by - any configuration arguments the plugin requires. These + relative to the _/_u_s_r_/_l_o_c_a_l_/_l_i_b_e_x_e_c_/_s_u_d_o directory, followed + by any configuration arguments the plugin requires. These arguments (if any) will be passed to the plugin's initialization function. If arguments are present, the string must be enclosed in double quotes (""). diff --git a/doc/sudoers.ldap.cat b/doc/sudoers.ldap.cat index 8c9d40ff2..ffcb48ba7 100644 --- a/doc/sudoers.ldap.cat +++ b/doc/sudoers.ldap.cat @@ -262,6 +262,10 @@ DDEESSCCRRIIPPTTIIOONN by ssuuddoo are honored. Configuration options are listed below in upper case but are parsed in a case-independent manner. + Long lines can be continued with a backslash (`\') as the last character + on the line. Note that leading white space is removed from the beginning + of lines even when the continuation character is used. + UURRII _l_d_a_p_[_s_]_:_/_/_[_h_o_s_t_n_a_m_e_[_:_p_o_r_t_]_] _._._. Specifies a white space-delimited list of one or more URIs describing the LDAP server(s) to connect to. The _p_r_o_t_o_c_o_l may be @@ -765,4 +769,4 @@ DDIISSCCLLAAIIMMEERR file distributed with ssuuddoo or http://www.sudo.ws/sudo/license.html for complete details. -Sudo 1.8.7 February 5, 2013 Sudo 1.8.7 +Sudo 1.8.7 February 7, 2013 Sudo 1.8.7 diff --git a/doc/sudoers.ldap.man.in b/doc/sudoers.ldap.man.in index 011055b1a..7de100c62 100644 --- a/doc/sudoers.ldap.man.in +++ b/doc/sudoers.ldap.man.in @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.TH "SUDOERS.LDAP" "8" "February 5, 2013" "Sudo @PACKAGE_VERSION@" "OpenBSD System Manager's Manual" +.TH "SUDOERS.LDAP" "8" "February 7, 2013" "Sudo @PACKAGE_VERSION@" "OpenBSD System Manager's Manual" .nh .if n .ad l .SH "NAME" @@ -463,6 +463,12 @@ as being supported by are honored. Configuration options are listed below in upper case but are parsed in a case-independent manner. +.PP +Long lines can be continued with a backslash +(`\e') +as the last character on the line. +Note that leading white space is removed from the beginning of lines +even when the continuation character is used. .TP 6n \fBURI\fR \fIldap[s]://[hostname[:port]] ...\fR Specifies a white space-delimited list of one or more URIs describing diff --git a/doc/sudoers.ldap.mdoc.in b/doc/sudoers.ldap.mdoc.in index c45e766cc..83c46e627 100644 --- a/doc/sudoers.ldap.mdoc.in +++ b/doc/sudoers.ldap.mdoc.in @@ -14,7 +14,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 5, 2013 +.Dd February 7, 2013 .Dt SUDOERS.LDAP @mansectsu@ .Os Sudo @PACKAGE_VERSION@ .Sh NAME @@ -440,6 +440,12 @@ as being supported by are honored. Configuration options are listed below in upper case but are parsed in a case-independent manner. +.Pp +Long lines can be continued with a backslash +.Pq Ql \e +as the last character on the line. +Note that leading white space is removed from the beginning of lines +even when the continuation character is used. .Bl -tag -width 4n .It Sy URI Ar ldap[s]://[hostname[:port]] ... Specifies a white space-delimited list of one or more URIs describing