From 31540e622869b6051a38d570ab5b398ec160f7e2 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 16 Feb 2017 10:28:08 -0700 Subject: [PATCH] Bump version to 1.11 for timeout entry in settings[] --- doc/sudo_plugin.cat | 11 ++++++++++- doc/sudo_plugin.man.in | 17 +++++++++++++++-- doc/sudo_plugin.mdoc.in | 15 +++++++++++++-- include/sudo_plugin.h | 2 +- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/doc/sudo_plugin.cat b/doc/sudo_plugin.cat index 56c26100e..ee99754c9 100644 --- a/doc/sudo_plugin.cat +++ b/doc/sudo_plugin.cat @@ -248,6 +248,12 @@ DDEESSCCRRIIPPTTIIOONN support _s_u_d_o_e_d_i_t. For more information, see the _c_h_e_c_k___p_o_l_i_c_y section. + timeout=string + User-specified command timeout. Not all plugins + support command timeouts and the ability for the user + to set a timeout may be restricted by policy. The + format of the timeout string is plugin-specific. + Additional settings may be added in the future so the plugin should silently ignore settings that it does not recognize. @@ -1554,6 +1560,9 @@ PPLLUUGGIINN AAPPII CCHHAANNGGEELLOOGG _i_o_l_o_g___m_o_d_e, and _i_o_l_o_g___u_s_e_r entries were added to the command_info list. + Version 1.11 (sudo 1.8.20) + The _t_i_m_e_o_u_t entry was added to the settings list. + SSEEEE AALLSSOO sudo.conf(4), sudoers(4), sudo(1m) @@ -1583,4 +1592,4 @@ DDIISSCCLLAAIIMMEERR file distributed with ssuuddoo or https://www.sudo.ws/license.html for complete details. -Sudo 1.8.20 November 17, 2016 Sudo 1.8.20 +Sudo 1.8.20 February 16, 2017 Sudo 1.8.20 diff --git a/doc/sudo_plugin.man.in b/doc/sudo_plugin.man.in index d452f60ba..7f40ff0df 100644 --- a/doc/sudo_plugin.man.in +++ b/doc/sudo_plugin.man.in @@ -1,7 +1,7 @@ .\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER! .\" IT IS GENERATED AUTOMATICALLY FROM sudo_plugin.mdoc.in .\" -.\" Copyright (c) 2009-2016 Todd C. Miller +.\" Copyright (c) 2009-2017 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.TH "SUDO_PLUGIN" "5" "November 17, 2016" "Sudo @PACKAGE_VERSION@" "File Formats Manual" +.TH "SUDO_PLUGIN" "5" "February 16, 2017" "Sudo @PACKAGE_VERSION@" "File Formats Manual" .nh .if n .ad l .SH "NAME" @@ -412,6 +412,12 @@ if the plugin does not support For more information, see the \fIcheck_policy\fR section. +.TP 6n +timeout=string +User-specified command timeout. +Not all plugins support command timeouts and the ability for the +user to set a timeout may be restricted by policy. +The format of the timeout string is plugin-specific. .PP Additional settings may be added in the future so the plugin should silently ignore settings that it does not recognize. @@ -2781,6 +2787,13 @@ and entries were added to the \fRcommand_info\fR list. +.TP 6n +Version 1.11 (sudo 1.8.20) +The +\fItimeout\fR +entry was added to the +\fRsettings\fR +list. .SH "SEE ALSO" sudo.conf(@mansectform@), sudoers(@mansectform@), diff --git a/doc/sudo_plugin.mdoc.in b/doc/sudo_plugin.mdoc.in index 86c7bc674..16c15b1fb 100644 --- a/doc/sudo_plugin.mdoc.in +++ b/doc/sudo_plugin.mdoc.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2009-2016 Todd C. Miller +.\" Copyright (c) 2009-2017 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 17, 2016 +.Dd February 16, 2017 .Dt SUDO_PLUGIN @mansectform@ .Os Sudo @PACKAGE_VERSION@ .Sh NAME @@ -371,6 +371,11 @@ if the plugin does not support For more information, see the .Em check_policy section. +.It timeout=string +User-specified command timeout. +Not all plugins support command timeouts and the ability for the +user to set a timeout may be restricted by policy. +The format of the timeout string is plugin-specific. .El .Pp Additional settings may be added in the future so the plugin should @@ -2436,6 +2441,12 @@ and entries were added to the .Li command_info list. +.It Version 1.11 (sudo 1.8.20) +The +.Em timeout +entry was added to the +.Li settings +list. .El .Sh SEE ALSO .Xr sudo.conf @mansectform@ , diff --git a/include/sudo_plugin.h b/include/sudo_plugin.h index 19b970484..309e2963b 100644 --- a/include/sudo_plugin.h +++ b/include/sudo_plugin.h @@ -19,7 +19,7 @@ /* API version major/minor */ #define SUDO_API_VERSION_MAJOR 1 -#define SUDO_API_VERSION_MINOR 10 +#define SUDO_API_VERSION_MINOR 11 #define SUDO_API_MKVERSION(x, y) (((x) << 16) | (y)) #define SUDO_API_VERSION SUDO_API_MKVERSION(SUDO_API_VERSION_MAJOR, SUDO_API_VERSION_MINOR) -- 2.40.0