From 6d8d1648d5474aa214ebb420a32efaf76cec3131 Mon Sep 17 00:00:00 2001 From: JinWang An Date: Mon, 14 Dec 2020 17:06:04 +0900 Subject: [PATCH] Imported Upstream version 1.8.19p1 --- ChangeLog | 25 +++++++++++++++++++++++++ NEWS | 7 ++++++- configure | 18 +++++++++--------- configure.ac | 2 +- doc/HISTORY | 12 +++++------- doc/LICENSE | 2 +- plugins/sudoers/defaults.c | 4 ++-- 7 files changed, 49 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bb5fb9..9a98a91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2016-12-20 Todd C. Miller + + * NEWS, configure, configure.ac: + sudo 1.8.19p1 + [7bfd43fa5caf] + + * plugins/sudoers/defaults.c: + Fix logic bug when matching syslog priority and facility. + [576cc9eb850f] + + * doc/HISTORY: + Dell spun off Quest so simplify the history by just talking about + Quest and not Dell. + [a66120495435] + +2016-12-19 Todd C. Miller + + * doc/LICENSE: + Fix copyright year + [3122e55195a6] + + * NEWS: + typo + [ffe9e84928b6] + 2016-12-18 Todd C. Miller * include/sudo_compat.h: diff --git a/NEWS b/NEWS index ee021a0..88690d7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +What's new in Sudo 1.8.19p1 + + * Fixed a bug introduced in sudo 1.8.19 that resulted in the wrong + syslog priority and facility being used. + What's new in Sudo 1.8.19 * New "syslog_maxlen" Defaults option to control the maximum size of @@ -29,7 +34,7 @@ What's new in Sudo 1.8.19 unknown or unparsable Defaults entry to go directly to the file with the problem. - * Fix a bug in the sudoers LDAP back-end where a negated sudoHost + * Fixed a bug in the sudoers LDAP back-end where a negated sudoHost entry would prevent other sudoHost entries following it from matching. * Warnings from visudo about a cycle in an Alias entry now include the diff --git a/configure b/configure index 0c7d0de..5bc7e68 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sudo 1.8.19. +# Generated by GNU Autoconf 2.69 for sudo 1.8.19p1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sudo' PACKAGE_TARNAME='sudo' -PACKAGE_VERSION='1.8.19' -PACKAGE_STRING='sudo 1.8.19' +PACKAGE_VERSION='1.8.19p1' +PACKAGE_STRING='sudo 1.8.19p1' PACKAGE_BUGREPORT='https://bugzilla.sudo.ws/' PACKAGE_URL='' @@ -1531,7 +1531,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sudo 1.8.19 to adapt to many kinds of systems. +\`configure' configures sudo 1.8.19p1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1596,7 +1596,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sudo 1.8.19:";; + short | recursive ) echo "Configuration of sudo 1.8.19p1:";; esac cat <<\_ACEOF @@ -1845,7 +1845,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sudo configure 1.8.19 +sudo configure 1.8.19p1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sudo $as_me 1.8.19, which was +It was created by sudo $as_me 1.8.19p1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -26552,7 +26552,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sudo $as_me 1.8.19, which was +This file was extended by sudo $as_me 1.8.19p1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26618,7 +26618,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sudo config.status 1.8.19 +sudo config.status 1.8.19p1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b271885..3842a91 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl dnl Copyright (c) 1994-1996,1998-2016 Todd C. Miller dnl AC_PREREQ([2.59]) -AC_INIT([sudo], [1.8.19], [https://bugzilla.sudo.ws/], [sudo]) +AC_INIT([sudo], [1.8.19p1], [https://bugzilla.sudo.ws/], [sudo]) AC_CONFIG_HEADER([config.h pathnames.h]) AC_CONFIG_SRCDIR([src/sudo.c]) dnl diff --git a/doc/HISTORY b/doc/HISTORY index 4031db4..a6e15e7 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -61,13 +61,11 @@ support for including multiple sudoers files. Quest Sponsorship -In 2010, Quest Software began sponsoring Sudo development by hiring Todd to -work on Sudo as part of his full-time job. - -Dell Sponsorship - -In 2012, Dell acquired Quest Software and continues to sponsor Sudo -development. +In 2010, Quest Software began sponsoring Sudo development by hiring +Todd to work on Sudo as part of his full-time job. This enabled +the addition of I/O logging, the plugin interface, additional +regression tests, support for binary packages and more regular +releases. Present Day diff --git a/doc/LICENSE b/doc/LICENSE index a17e341..1e151fe 100644 --- a/doc/LICENSE +++ b/doc/LICENSE @@ -1,6 +1,6 @@ Sudo is distributed under the following license: - Copyright (c) 1994-1996, 1998-2015 + Copyright (c) 1994-1996, 1998-2016 Todd C. Miller Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c index 66ef854..5eaf8ea 100644 --- a/plugins/sudoers/defaults.c +++ b/plugins/sudoers/defaults.c @@ -912,7 +912,7 @@ store_syslogfac(const char *str, union sudo_defs_val *sd_un) debug_return_bool(true); } for (fac = facilities; fac->name != NULL; fac++) { - if (strcmp(str, fac->name) != 0) { + if (strcmp(str, fac->name) == 0) { sd_un->ival = fac->num; debug_return_bool(true); } @@ -942,7 +942,7 @@ store_syslogpri(const char *str, union sudo_defs_val *sd_un) debug_return_bool(true); } for (pri = priorities; pri->name != NULL; pri++) { - if (strcmp(str, pri->name) != 0) { + if (strcmp(str, pri->name) == 0) { sd_un->ival = pri->num; debug_return_bool(true); } -- 2.7.4