From fbac05467b2433541ca96b85237d260064ce2f03 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 11 Nov 2014 14:18:07 -0700 Subject: [PATCH] Add sudo.conf to SEE ALSO and rename section on sudo.conf --- doc/visudo.cat | 19 ++++++++++--------- doc/visudo.man.in | 6 ++++-- doc/visudo.mdoc.in | 4 +++- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/doc/visudo.cat b/doc/visudo.cat index b950f42bf..3aadd7765 100644 --- a/doc/visudo.cat +++ b/doc/visudo.cat @@ -83,18 +83,19 @@ DDEESSCCRRIIPPTTIIOONN The various values have explicit types which removes much of the ambiguity of the _s_u_d_o_e_r_s format. - UUssiinngg ssuuddoo..ccoonnff wwiitthh vviissuuddoo + DDeebbuuggggiinngg aanndd ssuuddooeerrss pplluuggiinn aarrgguummeennttss vviissuuddoo versions 1.8.4 and higher support a flexible debugging framework - that is configured via Debug lines in the sudo.conf(4) file. Starting - with ssuuddoo 1.8.12, vviissuuddoo will also parse the arguments to the _s_u_d_o_e_r_s - plugin to override the default _s_u_d_o_e_r_s path name, UID, GID and file mode. - These arguments, if present, should be listed after the path to the - plugin (i.e. after _s_u_d_o_e_r_s_._s_o). Multiple arguments may be specified, - separated by white space. For example: + that is configured via Debug lines in the sudo.conf(4) file. + + Starting with ssuuddoo 1.8.12, vviissuuddoo will also parse the arguments to the + _s_u_d_o_e_r_s plugin to override the default _s_u_d_o_e_r_s path name, UID, GID and + file mode. These arguments, if present, should be listed after the path + to the plugin (i.e. after _s_u_d_o_e_r_s_._s_o). Multiple arguments may be + specified, separated by white space. For example: Plugin sudoers_policy sudoers.so sudoers_mode=0400 - The following plugin arguments are supported: + The following arguments are supported: sudoers_file=pathname The _s_u_d_o_e_r_s___f_i_l_e argument can be used to override the default @@ -166,7 +167,7 @@ DDIIAAGGNNOOSSTTIICCSS path name as the _s_u_d_o_e_r_s file to export. SSEEEE AALLSSOO - vi(1), sudoers(4), sudo(1m), vipw(1m) + vi(1), sudo.conf(4), sudoers(4), sudo(1m), vipw(1m) AAUUTTHHOORRSS Many people have worked on ssuuddoo over the years; this version consists of diff --git a/doc/visudo.man.in b/doc/visudo.man.in index a463259d6..f679b27da 100644 --- a/doc/visudo.man.in +++ b/doc/visudo.man.in @@ -233,7 +233,7 @@ The various values have explicit types which removes much of the ambiguity of the \fIsudoers\fR format. -.SS "Using sudo.conf with visudo" +.SS "Debugging and sudoers plugin arguments" \fBvisudo\fR versions 1.8.4 and higher support a flexible debugging framework that is configured via @@ -241,6 +241,7 @@ that is configured via lines in the sudo.conf(@mansectform@) file. +.PP Starting with \fBsudo\fR 1.8.12, @@ -262,7 +263,7 @@ Plugin sudoers_policy sudoers.so sudoers_mode=0400 .RE .fi .PP -The following plugin arguments are supported: +The following arguments are supported: .TP 10n sudoers_file=pathname The @@ -376,6 +377,7 @@ has the same path name as the file to export. .SH "SEE ALSO" vi(1), +sudo.conf(@mansectform@), sudoers(@mansectform@), sudo(@mansectsu@), vipw(@mansectsu@) diff --git a/doc/visudo.mdoc.in b/doc/visudo.mdoc.in index 0de0fa03d..748c26a2d 100644 --- a/doc/visudo.mdoc.in +++ b/doc/visudo.mdoc.in @@ -225,7 +225,7 @@ ambiguity of the .Em sudoers format. .El -.Ss Using sudo.conf with visudo +.Ss Debugging and sudoers plugin arguments .Nm visudo versions 1.8.4 and higher support a flexible debugging framework that is configured via @@ -233,6 +233,7 @@ that is configured via lines in the .Xr sudo.conf @mansectform@ file. +.Pp Starting with .Nm sudo 1.8.12, @@ -358,6 +359,7 @@ file to export. .El .Sh SEE ALSO .Xr vi 1 , +.Xr sudo.conf @mansectform@ , .Xr sudoers @mansectform@ , .Xr sudo @mansectsu@ , .Xr vipw @mansectsu@