merge sudo 1.8.25p1 from tip

--HG--
branch : 1.8

Author: millert

NEWS

@@ -1,3 +1,9 @@
+What's new in Sudo 1.8.25p1
+
+ * Fixed a bug introduced in sudo 1.8.25 that caused a crash on
+   systems that have the poll() function but not the ppoll() function.
+   Bug #851.
+
 What's new in Sudo 1.8.25
 
  * Fixed a bug introduced in sudo 1.8.20 that broke formatting of

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.25.
+# Generated by GNU Autoconf 2.69 for sudo 1.8.25p1.
 #
 # 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.25'
-PACKAGE_STRING='sudo 1.8.25'
+PACKAGE_VERSION='1.8.25p1'
+PACKAGE_STRING='sudo 1.8.25p1'
 PACKAGE_BUGREPORT='https://bugzilla.sudo.ws/'
 PACKAGE_URL=''
 
@@ -1542,7 +1542,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.25 to adapt to many kinds of systems.
+\`configure' configures sudo 1.8.25p1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1607,7 +1607,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sudo 1.8.25:";;
+     short | recursive ) echo "Configuration of sudo 1.8.25p1:";;
    esac
   cat <<\_ACEOF
 
@@ -1872,7 +1872,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sudo configure 1.8.25
+sudo configure 1.8.25p1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2581,7 +2581,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.25, which was
+It was created by sudo $as_me 1.8.25p1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -27308,7 +27308,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.25, which was
+This file was extended by sudo $as_me 1.8.25p1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27374,7 +27374,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.25
+sudo config.status 1.8.25p1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -4,7 +4,7 @@ dnl
 dnl Copyright (c) 1994-1996,1998-2018 Todd C. Miller <[email protected]>
 dnl
 AC_PREREQ([2.59])
-AC_INIT([sudo], [1.8.25], [https://bugzilla.sudo.ws/], [sudo])
+AC_INIT([sudo], [1.8.25p1], [https://bugzilla.sudo.ws/], [sudo])
 AC_CONFIG_HEADER([config.h pathnames.h])
 AC_CONFIG_SRCDIR([src/sudo.c])
 dnl

doc/CONTRIBUTORS

@@ -131,6 +131,7 @@ you believe you should be listed, please send a note to [email protected].
     Sato, Yuichi
     Sánchez, Wilfredo
     Sanders, Miguel
+    Sasaki, Kan
     Saucier, Jean-Francois
     Schoenfeld, Patrick
     Schuring, Arno

lib/util/event_poll.c

@@ -144,7 +144,8 @@ sudo_ev_poll(struct pollfd *fds, nfds_t nfds, const struct timespec *timo)
 static int
 sudo_ev_poll(struct pollfd *fds, nfds_t nfds, const struct timespec *timo)
 {
-    const int timeout = (timo->tv_sec * 1000) + (timo->tv_nsec / 1000000);
+    const int timeout =
+	timo ? (timo->tv_sec * 1000) + (timo->tv_nsec / 1000000) : -1;
 
     return poll(fds, nfds, timeout);
 }