Attempt to handle a default password prompt timeout of zero more gracefully.

--HG--
branch : 1.7

diff --git a/sudo.man.pl b/sudo.man.pl
index 2306c7c0fccada412cfef3d9667eea6e0db18645..e8e6125afeda3cc3fa0ca427c570db33f475fb33 100644 (file)
--- a/sudo.man.pl
+++ b/sudo.man.pl
@@ -7,7 +7,7 @@ BEGIN {
 
 # Initialize the numeric register we use for conditionals
 if ($cond == -1) {
-    $_ = ".nr SL \@SEMAN\@\n.nr BA \@BAMAN\@\n.nr LC \@LCMAN\@\n.\\\"\n$_";
+    $_ = ".nr SL \@SEMAN\@\n.nr BA \@BAMAN\@\n.nr LC \@LCMAN\@\n.nr PT \@password_timeout\@\n.\\\"\n$_";
     $cond = 0;
 }
 
@@ -30,3 +30,6 @@ if (/-a.*auth_type/) {
 
 # Fix up broken pod2man formatting of F<@foo@/bar>
 s/\\fI\\f(\(C)?I\@([^\@]*)\\fI\@/\\fI\@$2\@/g;
+
+# Try to deal sensibly with password_timeout being set to 0 by default
+s/([^ ]*\@password_timeout\@[^ ]* minutes.$)/\n.ie \\n(PT $1\n.el unlimited./;

diff --git a/sudo.pod b/sudo.pod
index 9d975a6806d6d3d314f8b227c38d4877072df73d..427527c799ec218cca2e8d88051515b612695fbe 100644 (file)
--- a/sudo.pod
+++ b/sudo.pod
@@ -75,10 +75,10 @@ is implied.
 
 B<sudo> determines who is an authorized user by consulting the file
 F<@sysconfdir@/sudoers>.  By running B<sudo> with the B<-v> option,
-a user can update the time stamp without running a I<command>. The
-password prompt itself will also time out if the user's password
-is not entered within C<@password_timeout@> minutes (unless overridden
-via I<sudoers>).
+a user can update the time stamp without running a I<command>.  If
+a password is required, B<sudo> will exit if the user's password
+is not entered within a configurable time limit.  The default
+password prompt timeout is C<@password_timeout@> minutes.
 
 If a user who is not listed in the I<sudoers> file tries to run a
 command via B<sudo>, mail is sent to the proper authorities, as