From 6b4d871b14fd51160dcd5e5262a4ff313d37044e Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" <Todd.Miller@courtesan.com> Date: Thu, 20 Jul 2017 11:44:50 -0600 Subject: [PATCH] Document that "-p prompt" overrides SUDO_PROMPT. --- doc/sudo.cat | 5 +++-- doc/sudo.man.in | 7 +++++-- doc/sudo.mdoc.in | 7 +++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/doc/sudo.cat b/doc/sudo.cat index 81b6f194e..747f72b71 100644 --- a/doc/sudo.cat +++ b/doc/sudo.cat @@ -522,7 +522,8 @@ EENNVVIIRROONNMMEENNTT SUDO_GID Set to the group ID of the user who invoked sudo. - SUDO_PROMPT Used as the default password prompt. + SUDO_PROMPT Used as the default password prompt unless the --pp option + was specified. SUDO_PS1 If set, PS1 will be set to its value for the program being run. @@ -628,4 +629,4 @@ DDIISSCCLLAAIIMMEERR file distributed with ssuuddoo or https://www.sudo.ws/license.html for complete details. -Sudo 1.8.21 February 16, 2017 Sudo 1.8.21 +Sudo 1.8.21 July 20, 2017 Sudo 1.8.21 diff --git a/doc/sudo.man.in b/doc/sudo.man.in index 1fb104894..d43654bfc 100644 --- a/doc/sudo.man.in +++ b/doc/sudo.man.in @@ -21,7 +21,7 @@ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" -.TH "SUDO" "8" "February 16, 2017" "Sudo @PACKAGE_VERSION@" "System Manager's Manual" +.TH "SUDO" "8" "July 20, 2017" "Sudo @PACKAGE_VERSION@" "System Manager's Manual" .nh .if n .ad l .SH "NAME" @@ -1048,7 +1048,10 @@ Default editor to use in Set to the group ID of the user who invoked sudo. .TP 17n \fRSUDO_PROMPT\fR -Used as the default password prompt. +Used as the default password prompt unless +the +\fB\-p\fR +option was specified. .TP 17n \fRSUDO_PS1\fR If set, diff --git a/doc/sudo.mdoc.in b/doc/sudo.mdoc.in index 9ce51b1d2..4f3ff9da9 100644 --- a/doc/sudo.mdoc.in +++ b/doc/sudo.mdoc.in @@ -19,7 +19,7 @@ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" -.Dd February 16, 2017 +.Dd July 20, 2017 .Dt SUDO @mansectsu@ .Os Sudo @PACKAGE_VERSION@ .Sh NAME @@ -965,7 +965,10 @@ Default editor to use in .It Ev SUDO_GID Set to the group ID of the user who invoked sudo. .It Ev SUDO_PROMPT -Used as the default password prompt. +Used as the default password prompt unless +the +.Fl p +option was specified. .It Ev SUDO_PS1 If set, .Ev PS1 -- 2.40.0