isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

o Kill HAVE_FNMATCH_H

Browse Source 
o Only define HAVE_FNMATCH if <fnmatch.h> exists.
This commit is contained in:
Todd C. Miller
1999-12-09 03:54:57 +00:00
parent 8446da40fb
commit 957fa7941d
8 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1198,7 +1198,7 @@ Sudo 1.6 released.
376) When using select() in tgetpass(), do a separate select before 376) When using select() in tgetpass(), do a separate select before
each read to be sure we can timeout correctly. 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 378) Fixed a bug parsing runas modifiers. If a user spec contained multiple
runas specs, the latter ones may not be applied. runas specs, the latter ones may not be applied.

1
RUNSON
View File

@@ -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.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.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.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 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 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= SVR4 4.4 m88k bundled gcc 1.6rc1 Gerry Belanger CFLAGS=

6
aclocal.m4 vendored
View File

@@ -235,9 +235,9 @@ AC_DEFUN(SUDO_FUNC_FNMATCH,
[AC_MSG_CHECKING(for working fnmatch) [AC_MSG_CHECKING(for working fnmatch)
AC_CACHE_VAL(sudo_cv_func_fnmatch, AC_CACHE_VAL(sudo_cv_func_fnmatch,
[rm -f conftestdata; > conftestdata [rm -f conftestdata; > conftestdata
AC_TRY_RUN([main() { AC_TRY_RUN([#include <fnmatch.h>
exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", 0)); 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=yes, sudo_cv_func_fnmatch=no,
sudo_cv_func_fnmatch=no) sudo_cv_func_fnmatch=no)
rm -f core core.* *.core])dnl rm -f core core.* *.core])dnl
AC_MSG_RESULT($sudo_cv_func_fnmatch) AC_MSG_RESULT($sudo_cv_func_fnmatch)

3
config.h.in
View File

@@ -298,9 +298,6 @@
/* Define if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #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. */ /* Define if you have the <netgroup.h> header file. */
#undef HAVE_NETGROUP_H #undef HAVE_NETGROUP_H

8
configure vendored
View File

@@ -4807,7 +4807,7 @@ fi
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 do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -6339,9 +6339,9 @@ else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6341 "configure" #line 6341 "configure"
#include "confdefs.h" #include "confdefs.h"
main() { #include <fnmatch.h>
exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", 0)); main() { exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", 0)); }
}
EOF EOF
if { (eval echo configure:6347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:6347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then

2
configure.in
View File

@@ -1304,7 +1304,7 @@ dnl Header file checks
dnl dnl
AC_HEADER_STDC AC_HEADER_STDC
AC_HEADER_DIRENT 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 dnl ultrix termio/termios are broken
if test "$OS" != "ultrix"; then if test "$OS" != "ultrix"; then
AC_CHECK_HEADERS(termio.h) AC_CHECK_HEADERS(termio.h)

2
parse.c
View File

@@ -50,7 +50,7 @@
#ifdef HAVE_STRINGS_H #ifdef HAVE_STRINGS_H
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#if defined(HAVE_FNMATCH) && defined(HAVE_FNMATCH_H) #ifdef HAVE_FNMATCH
# include <fnmatch.h> # include <fnmatch.h>
#endif /* HAVE_FNMATCH_H */ #endif /* HAVE_FNMATCH_H */
#ifdef HAVE_NETGROUP_H #ifdef HAVE_NETGROUP_H

2
testsudoers.c
View File

@@ -50,7 +50,7 @@
#ifdef HAVE_STRINGS_H #ifdef HAVE_STRINGS_H
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#if defined(HAVE_FNMATCH) && defined(HAVE_FNMATCH_H) #ifdef HAVE_FNMATCH
# include <fnmatch.h> # include <fnmatch.h>
#endif /* HAVE_FNMATCH_H */ #endif /* HAVE_FNMATCH_H */
#ifdef HAVE_NETGROUP_H #ifdef HAVE_NETGROUP_H