o Kill HAVE_FNMATCH_H

o Only define HAVE_FNMATCH if <fnmatch.h> exists.

diff --git a/CHANGES b/CHANGES
index cb8868bc40ab266b974849b3536b7233fcfb0382..35397850cb712b683eacc4483a8365fb7c95afc4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1198,7 +1198,7 @@ Sudo 1.6 released.
 376) When using select() in tgetpass(), do a separate select before
      each read to be sure we can timeout correctly.
 
-377) Hopefully fix SecurID support.
+377) SecurID support compiles and works again.
 
 378) Fixed a bug parsing runas modifiers.  If a user spec contained multiple
      runas specs, the latter ones may not be applied.

diff --git a/RUNSON b/RUNSON
index 37fa38e29749e874168de8457472c24353738e0a..a98a9287583c2468e08d5ad490cc5ef271d26c04 100644 (file)
--- a/RUNSON
+++ b/RUNSON
@@ -123,6 +123,7 @@ Dynix/ptx 4.1.5     i386    gcc2.7.2        1.5.4   Leon von Stauber none
 Dynix/ptx 4.4.2        Sequent bundled cc      1.5.4p1 Larry Mascarenhas none
 Dynix/ptx 4.4.3        Sequent bundled cc      1.5.6p2 Sandra Birgerson none
 Dynix/ptx 4.4.4        Sequent bundled cc      1.5.9p2 Jason Merritt    none
+Dynix/ptx 4.4.6        Sequent bundled cc      1.6     Larry Mascarenhase none
 DC-OSx 1.1-9x  mips    PyrC 4.0A20     1.5.6p2 Brian Jackson    none
 HI-UX/MPP 02-03        sr2201  bundled cc      1.5.4   Ben Edgington    none
 SVR4   4.4     m88k    bundled gcc     1.6rc1  Gerry Belanger   CFLAGS=

diff --git a/aclocal.m4 b/aclocal.m4
index f10e261601d19723a3c4d1eee5d0ab3b16f90e3d..3903c88406e0419f39be8efa73f66f8a4a1199a8 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -235,9 +235,9 @@ AC_DEFUN(SUDO_FUNC_FNMATCH,
 [AC_MSG_CHECKING(for working fnmatch)
 AC_CACHE_VAL(sudo_cv_func_fnmatch,
 [rm -f conftestdata; > conftestdata
-AC_TRY_RUN([main() {
-exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", 0));
-}], sudo_cv_func_fnmatch=yes, sudo_cv_func_fnmatch=no,
+AC_TRY_RUN([#include <fnmatch.h>
+main() { exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", 0)); }
+], sudo_cv_func_fnmatch=yes, sudo_cv_func_fnmatch=no,
   sudo_cv_func_fnmatch=no)
 rm -f core core.* *.core])dnl
 AC_MSG_RESULT($sudo_cv_func_fnmatch)

diff --git a/config.h.in b/config.h.in
index feec33cacde18cd2fabc4d21afd16e812e581ced..7b5df580f62052dd28ebe75322250b5c598ecde1 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -298,9 +298,6 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
-/* Define if you have the <fnmatch.h> header file.  */
-#undef HAVE_FNMATCH_H
-
 /* Define if you have the <netgroup.h> header file.  */
 #undef HAVE_NETGROUP_H
 

diff --git a/configure b/configure
index 798728a7899e8a2e08dc6d9dccca46209e54728b..5f60af6be3fde9f26e6ab2062fbf704827b9aeb7 100755 (executable)
--- a/configure
+++ b/configure
@@ -4807,7 +4807,7 @@ fi
 
 fi
 
-for ac_hdr in string.h strings.h unistd.h malloc.h paths.h utime.h fnmatch.h netgroup.h sys/sockio.h sys/bsdtypes.h sys/select.h
+for ac_hdr in string.h strings.h unistd.h malloc.h paths.h utime.h netgroup.h sys/sockio.h sys/bsdtypes.h sys/select.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -6339,9 +6339,9 @@ else
   cat > conftest.$ac_ext <<EOF
 #line 6341 "configure"
 #include "confdefs.h"
-main() {
-exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", 0));
-}
+#include <fnmatch.h>
+main() { exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", 0)); }
+
 EOF
 if { (eval echo configure:6347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then

diff --git a/configure.in b/configure.in
index 6cdd1d3dd212ecad3a27b875e3a3bf1c1ec75927..b3bafa75fc8a8699aeb7581a800df2d7f5bc5a5e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1304,7 +1304,7 @@ dnl Header file checks
 dnl
 AC_HEADER_STDC
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(string.h strings.h unistd.h malloc.h paths.h utime.h fnmatch.h netgroup.h sys/sockio.h sys/bsdtypes.h sys/select.h)
+AC_CHECK_HEADERS(string.h strings.h unistd.h malloc.h paths.h utime.h netgroup.h sys/sockio.h sys/bsdtypes.h sys/select.h)
 dnl ultrix termio/termios are broken
 if test "$OS" != "ultrix"; then
     AC_CHECK_HEADERS(termio.h)

diff --git a/parse.c b/parse.c
index 0f3b7b6468dbc4af3afaa7254301c073811de510..6e9c4cd2e4c0a4d4f949fd9886d6c5dda2c39aeb 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -50,7 +50,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#if defined(HAVE_FNMATCH) && defined(HAVE_FNMATCH_H)
+#ifdef HAVE_FNMATCH
 # include <fnmatch.h>
 #endif /* HAVE_FNMATCH_H */
 #ifdef HAVE_NETGROUP_H

diff --git a/testsudoers.c b/testsudoers.c
index 1756377c31f2f44dfef924404405ab5df206fe26..c98fdb494934f3a234a82759fad564bc692c1137 100644 (file)
--- a/testsudoers.c
+++ b/testsudoers.c
@@ -50,7 +50,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#if defined(HAVE_FNMATCH) && defined(HAVE_FNMATCH_H)
+#ifdef HAVE_FNMATCH
 # include <fnmatch.h>
 #endif /* HAVE_FNMATCH_H */
 #ifdef HAVE_NETGROUP_H