merge sudo 1.8.19p1 from tip

--HG--
branch : 1.8

diff --git a/NEWS b/NEWS
index ee021a054a5c8eba3173ced86b5d19a739a6f67a..88690d723dc80e9f92dd3a2c47ea019b1bb49d06 100644 (file)
--- 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 0c7d0def14f384ecf6f2368cda7fb4dea0e07d85..5bc7e68f41e97beb55583432c5899fcdba1f6cd4 100755 (executable)
--- 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 <https://bugzilla.sudo.ws/>.
 #
@@ -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 b2718851643ce7187b7e57a6ebdd447feea38d75..3842a913118a1509846f2016a23f166447c06739 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl
 dnl Copyright (c) 1994-1996,1998-2016 Todd C. Miller <Todd.Miller@courtesan.com>
 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 4031db4632a11c115d26f1cd08eddefc3b908fd7..a6e15e7abac1f1317e7c067dad781f21be00db3d 100644 (file)
--- 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 a17e3419b43db4610760f50a59e93fc175ba1673..1e151fe9f6c72157a54f17d4554b389edea0c0b5 100644 (file)
--- 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 <Todd.Miller@courtesan.com>
 
    Permission to use, copy, modify, and distribute this software for any

diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
index 66ef8540f640fa333d851f77928d5096ab7e1d49..5eaf8ea9358ce6aa183ac57124f2d3ecd447f382 100644 (file)
--- 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);
        }