We require ANSI C so stop using the obsolete STDC_HEADERS.

diff --git a/configure b/configure
index 469cb5a22035eac2f3246f3a71f6a5d5790b72aa..84b590a5fb3993011c0b9eeeec8bf750c96cc761 100755 (executable)
--- a/configure
+++ b/configure
@@ -16345,118 +16345,6 @@ _ACEOF
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $logfac" >&5
 $as_echo "$logfac" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-                  (('a' <= (c) && (c) <= 'i') \
-                    || ('j' <= (c) && (c) <= 'r') \
-                    || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-       || toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`

diff --git a/configure.ac b/configure.ac
index 1cf276db67b972268596630ada05684113fb1928..abf046a710c8c8c4408fee3b181d7168ffe0808c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2237,7 +2237,6 @@ AC_MSG_RESULT($logfac)
 dnl
 dnl Header file checks
 dnl
-AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_TIME
 AC_HEADER_STDBOOL

diff --git a/include/sudo_compat.h b/include/sudo_compat.h
index 4c573db2a9d9be373924c612470a9654786cd34a..b883afe226b277bac87a9b916230701705cc8f31 100644 (file)
--- a/include/sudo_compat.h
+++ b/include/sudo_compat.h
@@ -23,9 +23,7 @@
 #define SUDO_COMPAT_H
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stddef.h>
-#endif
+#include <stddef.h>
 #include <stdarg.h>
 
 /*

diff --git a/lib/util/aix.c b/lib/util/aix.c
index 632c7b053b84def3f4a5cf2d2e0bebb8e727ceee..9ff06d921b6b81664843d5dc260c75e1447aaddb 100644 (file)
--- a/lib/util/aix.c
+++ b/lib/util/aix.c
@@ -20,14 +20,8 @@
 #include <sys/resource.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 #include <usersec.h>
 #include <uinfo.h>

diff --git a/lib/util/closefrom.c b/lib/util/closefrom.c
index 27c01d22b9d4b9f3d8c57a05926d3928248b24bd..45501ae204f9dde51211e79d72635e874df7a212 100644 (file)
--- a/lib/util/closefrom.c
+++ b/lib/util/closefrom.c
@@ -22,14 +22,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <fcntl.h>
 #include <limits.h>
 #ifdef HAVE_PSTAT_GETPROC

diff --git a/lib/util/event.c b/lib/util/event.c
index 790e69e42ccc5729a18ed8651ecaf149295c442d..cc4322e795a341572782dd3d1b48fa14cd2f6487 100644 (file)
--- a/lib/util/event.c
+++ b/lib/util/event.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/lib/util/event_poll.c b/lib/util/event_poll.c
index 1628e53e724e6169d03abd07354c0b2e04bd8487..4912078e240b020d680a46755f5a3e8aaa554f9e 100644 (file)
--- a/lib/util/event_poll.c
+++ b/lib/util/event_poll.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/lib/util/event_select.c b/lib/util/event_select.c
index ae883bb09762c110910047146a93257c0faa8bdb..16344aa8951bae44b84228413251fdb907f60da4 100644 (file)
--- a/lib/util/event_select.c
+++ b/lib/util/event_select.c
@@ -25,14 +25,8 @@
 # include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/lib/util/getaddrinfo.c b/lib/util/getaddrinfo.c
index b39a9f90fe7a0da516232a352d3e0e80e92c1c55..4f0c29fdb46b201c86cc00f5f91d8caf43eeed72 100644 (file)
--- a/lib/util/getaddrinfo.c
+++ b/lib/util/getaddrinfo.c
@@ -38,14 +38,8 @@
 #include <sys/socket.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/getcwd.c b/lib/util/getcwd.c
index c51df79aac1ea150cf0835a1bf2d41652de52234..df6486eca8ccf727d717040a9eb6c0ad40e1b772 100644 (file)
--- a/lib/util/getcwd.c
+++ b/lib/util/getcwd.c
@@ -36,14 +36,8 @@
 
 #include <errno.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/getgrouplist.c b/lib/util/getgrouplist.c
index d05135919e754be253030eaa0a5d1b9f2c722d03..7dc69610df978ada45d39bddb7267c716cb8620c 100644 (file)
--- a/lib/util/getgrouplist.c
+++ b/lib/util/getgrouplist.c
@@ -21,14 +21,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/gethostname.c b/lib/util/gethostname.c
index e488f2299f28cf8e2df57cbde619efc5d50bd613..382ac2bb5c48ca9ec994c925e0f21a5bef7c3011 100644 (file)
--- a/lib/util/gethostname.c
+++ b/lib/util/gethostname.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <unistd.h>
 
 #include "sudo_compat.h"

diff --git a/lib/util/getline.c b/lib/util/getline.c
index 5e7ba5a61db234140b818dcb4a7b4c30f41bd95e..d705911dc2cca02d77fb12c986ad391d838ee08e 100644 (file)
--- a/lib/util/getline.c
+++ b/lib/util/getline.c
@@ -21,14 +21,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/getopt_long.c b/lib/util/getopt_long.c
index 540dd461ebcbc92717c7d30d58f6e533ab70b11a..9465f47aa8e21a222b4eb92b4b942825c9eac4cd 100644 (file)
--- a/lib/util/getopt_long.c
+++ b/lib/util/getopt_long.c
@@ -54,14 +54,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/gettime.c b/lib/util/gettime.c
index 04676f50a2473826de0e73e312b17ce01701671f..f0139e28562c4674dc700d1e89e5cb70fcdf74cd 100644 (file)
--- a/lib/util/gettime.c
+++ b/lib/util/gettime.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */

diff --git a/lib/util/gidlist.c b/lib/util/gidlist.c
index 0a15863a773c42336054beeccf8281e6047ae7db..e108cacd9c8b51206d1e0ba640579924e112c517 100644 (file)
--- a/lib/util/gidlist.c
+++ b/lib/util/gidlist.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <grp.h>
 
 #define DEFAULT_TEXT_DOMAIN    "sudo"

diff --git a/lib/util/glob.c b/lib/util/glob.c
index e73211d085b59e42a12ab27ca65f53589c15d891..3f0b44ec325c1403dbf27cd804b630e65fbd435a 100644 (file)
--- a/lib/util/glob.c
+++ b/lib/util/glob.c
@@ -58,14 +58,8 @@
 #include <sys/stat.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/key_val.c b/lib/util/key_val.c
index bd641e3cc909fbfff8e0451d098b4e29870419b7..7b1231ec8d949e06598f3c88030ea87a5ac5c071 100644 (file)
--- a/lib/util/key_val.c
+++ b/lib/util/key_val.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/lbuf.c b/lib/util/lbuf.c
index efe3129198edd0d08157b02cdfc3abe9e92b4f6c..c87c40f4443422bbbd169259dcfb1e81b462240a 100644 (file)
--- a/lib/util/lbuf.c
+++ b/lib/util/lbuf.c
@@ -20,14 +20,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/locking.c b/lib/util/locking.c
index 4daec57fd666038b6abc7105279a2cae38b37d0c..e7c6a07db4df2d811671a95ac6539622a659588e 100644 (file)
--- a/lib/util/locking.c
+++ b/lib/util/locking.c
@@ -25,14 +25,8 @@
 #ifdef HAVE_FLOCK
 # include <sys/file.h>
 #endif /* HAVE_FLOCK */
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/mksiglist.c b/lib/util/mksiglist.c
index 80824e3da957dc1ba9ead19e0681714fb31066a8..5a82370f6b10fd92e6f62706fdec837300528fd5 100644 (file)
--- a/lib/util/mksiglist.c
+++ b/lib/util/mksiglist.c
@@ -20,14 +20,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <signal.h>
 
 #include "sudo_compat.h"

diff --git a/lib/util/mksigname.c b/lib/util/mksigname.c
index 124d78b2aa2d3385f64dc121293931b929453dc9..d221638cef5d1e124be4f75c3fc10bc2bbd0e7db 100644 (file)
--- a/lib/util/mksigname.c
+++ b/lib/util/mksigname.c
@@ -20,14 +20,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <signal.h>
 
 #include "sudo_compat.h"

diff --git a/lib/util/parseln.c b/lib/util/parseln.c
index 30f7d5e645f23cf33277d8d49258da282820dfe1..70e05cd26a7bab35b6964a6fe56c8d088bec4a85 100644 (file)
--- a/lib/util/parseln.c
+++ b/lib/util/parseln.c
@@ -18,14 +18,8 @@
 #include <config.h>
 
 #include <sys/types.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/progname.c b/lib/util/progname.c
index 1f4bba8a1dcbff7cc638170b2554aff325aed912..67b676709791f2c648163e9668a0121ee798fa2f 100644 (file)
--- a/lib/util/progname.c
+++ b/lib/util/progname.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/pw_dup.c b/lib/util/pw_dup.c
index 49b4d1eac60c32d0999c111ef026c29e0231f5d9..1a901d773e9f97cbadab0daba1846d3423256376 100644 (file)
--- a/lib/util/pw_dup.c
+++ b/lib/util/pw_dup.c
@@ -26,14 +26,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/reallocarray.c b/lib/util/reallocarray.c
index 071ab7c78b3e53a42dd003ef55bab4c27dc19fa8..37b2f75efdb47b09d92f1a40a88e8aeed8887881 100644 (file)
--- a/lib/util/reallocarray.c
+++ b/lib/util/reallocarray.c
@@ -20,14 +20,8 @@
 #ifndef HAVE_REALLOCARRAY
 
 #include <sys/types.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)

diff --git a/lib/util/regress/atofoo/atofoo_test.c b/lib/util/regress/atofoo/atofoo_test.c
index 7a8264e272ae7ccbb9a08fb3de4cdc5cef86dc59..fa4f53232e9da610ed30fc2014dbc6c1f922a9aa 100644 (file)
--- a/lib/util/regress/atofoo/atofoo_test.c
+++ b/lib/util/regress/atofoo/atofoo_test.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/lib/util/regress/parse_gids/parse_gids_test.c b/lib/util/regress/parse_gids/parse_gids_test.c
index 1ed8847c60c8079f582e4cf54eeb2c6e08d67297..dcc343824900f4249c80e3a9943bfcc60a94922f 100644 (file)
--- a/lib/util/regress/parse_gids/parse_gids_test.c
+++ b/lib/util/regress/parse_gids/parse_gids_test.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/regress/progname/progname_test.c b/lib/util/regress/progname/progname_test.c
index 95338554ce18dc7b02efc4072d77962a8d8904ed..83deddf98178ed787554a6046defccff6bc92015 100644 (file)
--- a/lib/util/regress/progname/progname_test.c
+++ b/lib/util/regress/progname/progname_test.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/regress/strsplit/strsplit_test.c b/lib/util/regress/strsplit/strsplit_test.c
index fd2ecd16a99a388f44395550c44122ecaf58c3bd..7e5455d3f7d0f8452beaa34f31dfaca60af45bf6 100644 (file)
--- a/lib/util/regress/strsplit/strsplit_test.c
+++ b/lib/util/regress/strsplit/strsplit_test.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/regress/sudo_conf/conf_test.c b/lib/util/regress/sudo_conf/conf_test.c
index 4b7cd10c4bb391fdbfaa5dc62371400854ab1d28..d9e8e41de60dbf2c1891b3ef84ae51b8e9edc038 100644 (file)
--- a/lib/util/regress/sudo_conf/conf_test.c
+++ b/lib/util/regress/sudo_conf/conf_test.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/regress/sudo_parseln/parseln_test.c b/lib/util/regress/sudo_parseln/parseln_test.c
index 549ef19bdb8487ed2c8e5ce46ddaa7c9ce8cf0ee..f6bd5be45d95b8fe609abad2e200c1fd172ebae2 100644 (file)
--- a/lib/util/regress/sudo_parseln/parseln_test.c
+++ b/lib/util/regress/sudo_parseln/parseln_test.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/regress/tailq/hltq_test.c b/lib/util/regress/tailq/hltq_test.c
index 353370a9a8811a99c6d99c3cc29de4377ea1b110..de300fab3156ef7f5340b571ab13b6ff6e966057 100644 (file)
--- a/lib/util/regress/tailq/hltq_test.c
+++ b/lib/util/regress/tailq/hltq_test.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/setgroups.c b/lib/util/setgroups.c
index 18843b39c81ea56bd3ca54bf452412194afcfd7e..d5e9b8733ec3e25e70defb71765d9bd70f719b70 100644 (file)
--- a/lib/util/setgroups.c
+++ b/lib/util/setgroups.c
@@ -20,14 +20,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */

diff --git a/lib/util/sha2.c b/lib/util/sha2.c
index c2b2a2a89581e19f1136513ccf99fd7ec9512a23..0c7d11ec6d5c4a43de75b6e393cd1887c0e24e3e 100644 (file)
--- a/lib/util/sha2.c
+++ b/lib/util/sha2.c
@@ -27,14 +27,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/sig2str.c b/lib/util/sig2str.c
index aa8cf10f45ad38619494d0e2af77dc6a8b0e583a..9980fbfc923ae4829bc53b963482b4c66f352b05 100644 (file)
--- a/lib/util/sig2str.c
+++ b/lib/util/sig2str.c
@@ -22,14 +22,8 @@
 
 #include <errno.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/snprintf.c b/lib/util/snprintf.c
index b8c797e1c42efcffb24e0f213ceb2635335003ba..429032dff1f8bf7972076c7d6a867535d2550b86 100644 (file)
--- a/lib/util/snprintf.c
+++ b/lib/util/snprintf.c
@@ -54,14 +54,8 @@
 #endif
 #include <limits.h>
 #include <stdarg.h>
-#ifdef STDC_HEADERS
-# include <stddef.h>
-# include <stdlib.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stddef.h>
+#include <stdlib.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)

diff --git a/lib/util/strndup.c b/lib/util/strndup.c
index 3b5f726f6cf2b741d90bcc79d2a15b5149094671..c07531d0e97972287c9ef48cb6a7963c53aa8616 100644 (file)
--- a/lib/util/strndup.c
+++ b/lib/util/strndup.c
@@ -22,14 +22,8 @@
 
 #include <sys/types.h>
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/strsplit.c b/lib/util/strsplit.c
index 15aaf17ef8d2cf77a2963692b3469d107c566774..1a040a6e7bd1083d1ccc31c336a0a71dd9e96508 100644 (file)
--- a/lib/util/strsplit.c
+++ b/lib/util/strsplit.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 #include <grp.h>
 

diff --git a/lib/util/strtobool.c b/lib/util/strtobool.c
index f1ac2bc5eb0d42005c43c2e5ae84f7fb240536fc..3413a729b37fa7261978f21c54684f0f1e2a629b 100644 (file)
--- a/lib/util/strtobool.c
+++ b/lib/util/strtobool.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/strtoid.c b/lib/util/strtoid.c
index 8c02604cd066f724fe98493bceae99afe08ca0f8..769278e90f251782b2d91e36b8e0222292ed3b1f 100644 (file)
--- a/lib/util/strtoid.c
+++ b/lib/util/strtoid.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)

diff --git a/lib/util/strtomode.c b/lib/util/strtomode.c
index ea61d59c629dd6c3cd8d80045c7f2c30e681e848..b2091f939bb05203c1e22da550ac70726ef9fb22 100644 (file)
--- a/lib/util/strtomode.c
+++ b/lib/util/strtomode.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 
 #define DEFAULT_TEXT_DOMAIN    "sudo"

diff --git a/lib/util/strtonum.c b/lib/util/strtonum.c
index e3b2b1057ff72a487aed7fcaabbfc113e3a1f4b3..1a60013d3c40bff784581afa09bc0b478660ebcb 100644 (file)
--- a/lib/util/strtonum.c
+++ b/lib/util/strtonum.c
@@ -22,14 +22,8 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/sudo_conf.c b/lib/util/sudo_conf.c
index 3cac899618b8ffba4100267a8150273e355c0598..9e8961178f4fd51949b4c7a15f10de0f49817b71 100644 (file)
--- a/lib/util/sudo_conf.c
+++ b/lib/util/sudo_conf.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/lib/util/sudo_debug.c b/lib/util/sudo_debug.c
index fa9fd7b98cf0e2ddd4945209057a4cc90b59dbb8..9754a6394f6b9b8759a9bcc443514e02a63ae9b2 100644 (file)
--- a/lib/util/sudo_debug.c
+++ b/lib/util/sudo_debug.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/sudo_dso.c b/lib/util/sudo_dso.c
index 69726c54d8a63d33d2997353b3db825e1761e0fe..e929577cda0afd7c5b01efb3b0376f96c65034a9 100644 (file)
--- a/lib/util/sudo_dso.c
+++ b/lib/util/sudo_dso.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/term.c b/lib/util/term.c
index ef775b704102e37eb57d12ed5ed704816132b7c4..d2dcefd935724f7c6733ef2e436704f70d271558 100644 (file)
--- a/lib/util/term.c
+++ b/lib/util/term.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/lib/util/ttysize.c b/lib/util/ttysize.c
index 8c07bcdf9adec995903b767d5d3230b40e287368..6f5489aa11fb1fdf7181f1c6e2542f1c941947cc 100644 (file)
--- a/lib/util/ttysize.c
+++ b/lib/util/ttysize.c
@@ -21,14 +21,8 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */

diff --git a/plugins/group_file/getgrent.c b/plugins/group_file/getgrent.c
index d159d6563cb3cd9166d67e3694a370f04cdb12f5..1c39126b9d7cb87caf578bbea275245470a324a2 100644 (file)
--- a/plugins/group_file/getgrent.c
+++ b/plugins/group_file/getgrent.c
@@ -22,14 +22,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/group_file/group_file.c b/plugins/group_file/group_file.c
index 6f1df92ea40cc05362b0e0f4e233292419c82290..336ee2c656565a2ab5b3cde1944c48c0089368a4 100644 (file)
--- a/plugins/group_file/group_file.c
+++ b/plugins/group_file/group_file.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/plugins/sample/sample_plugin.c b/plugins/sample/sample_plugin.c
index 5f7ca5f23d7320de9b4f3599819186b02d2ec7fa..5fefcb21cbb451988f358fba82f4f1bef689a3e1 100644 (file)
--- a/plugins/sample/sample_plugin.c
+++ b/plugins/sample/sample_plugin.c
@@ -21,14 +21,8 @@
 #include <sys/wait.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/plugins/sudoers/alias.c b/plugins/sudoers/alias.c
index 7b31fb2a85ebb918893b1e87d4158a70d90c605b..0bde58f475fad603b091fdc2f7a94a7750603bd3 100644 (file)
--- a/plugins/sudoers/alias.c
+++ b/plugins/sudoers/alias.c
@@ -21,14 +21,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/audit.c b/plugins/sudoers/audit.c
index 509b8f678f4a3643cd26d9cf49e3020dfd61c757..ddf97bc4c837c95dd6ff73be2ac1ba2a665bc8ed 100644 (file)
--- a/plugins/sudoers/audit.c
+++ b/plugins/sudoers/audit.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 
 #include "sudoers.h"
 

diff --git a/plugins/sudoers/auth/afs.c b/plugins/sudoers/auth/afs.c
index c18c71b7df940677d8c897111aa67a620123a1b1..67aa9386ce6e64b81d1be234d87ea157b14911a5 100644 (file)
--- a/plugins/sudoers/auth/afs.c
+++ b/plugins/sudoers/auth/afs.c
@@ -25,14 +25,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/aix_auth.c b/plugins/sudoers/auth/aix_auth.c
index 3471dc3910db9a1f1e29391c3b50f3161c3c9023..9a79b2739f0d47da60809d26a70f61aea644df02 100644 (file)
--- a/plugins/sudoers/auth/aix_auth.c
+++ b/plugins/sudoers/auth/aix_auth.c
@@ -24,14 +24,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/bsdauth.c b/plugins/sudoers/auth/bsdauth.c
index 7ecc583084f68a1e6469d39260fadcf20588c935..20d0a993bf63041d57fbf3b0579e2a9b53148b9b 100644 (file)
--- a/plugins/sudoers/auth/bsdauth.c
+++ b/plugins/sudoers/auth/bsdauth.c
@@ -25,14 +25,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/dce.c b/plugins/sudoers/auth/dce.c
index 34e21551891d19ace4c897cc7bd07bee210f251d..674936ffb9b42e992a5eb387e9442d843250c009 100644 (file)
--- a/plugins/sudoers/auth/dce.c
+++ b/plugins/sudoers/auth/dce.c
@@ -39,14 +39,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/fwtk.c b/plugins/sudoers/auth/fwtk.c
index 120be77c7a621d7f8baae1f742fccd3b41ab0724..9967c9049187fa5654dd58a4da2931ea3b06a2d6 100644 (file)
--- a/plugins/sudoers/auth/fwtk.c
+++ b/plugins/sudoers/auth/fwtk.c
@@ -25,14 +25,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/kerb5.c b/plugins/sudoers/auth/kerb5.c
index 6bfb1d71dc2d766032b9c654836f617f15e290b3..f356d0fbe7e018e1e604efd05fdc6f4fc74ced40 100644 (file)
--- a/plugins/sudoers/auth/kerb5.c
+++ b/plugins/sudoers/auth/kerb5.c
@@ -28,14 +28,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c
index 85d3ce81ad863686a5adea2af748a13ecbdf1e6a..79b3a4d85088ee6de89aeffadb59f45aecb10f30 100644 (file)
--- a/plugins/sudoers/auth/pam.c
+++ b/plugins/sudoers/auth/pam.c
@@ -24,14 +24,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c
index 75955e7bfcc33d7bd2f42ccfcbcc0f28fd5da1a8..18074bf55ae6f78cc9c7f8dd3ebf466c3de8166b 100644 (file)
--- a/plugins/sudoers/auth/passwd.c
+++ b/plugins/sudoers/auth/passwd.c
@@ -22,14 +22,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/rfc1938.c b/plugins/sudoers/auth/rfc1938.c
index fbe199019434d9872b34adff2bcd4c55e4424d7b..f39a76520ca74ae313930350baa60a8117e5c748 100644 (file)
--- a/plugins/sudoers/auth/rfc1938.c
+++ b/plugins/sudoers/auth/rfc1938.c
@@ -25,14 +25,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/secureware.c b/plugins/sudoers/auth/secureware.c
index df0631b92cafc8bb3b5194eb5c0dde6de6ab069f..f482841afbc3ef0df72a429d50f3370fbd706e4f 100644 (file)
--- a/plugins/sudoers/auth/secureware.c
+++ b/plugins/sudoers/auth/secureware.c
@@ -24,14 +24,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/securid5.c b/plugins/sudoers/auth/securid5.c
index e4fd3229006261136ddbbfc55211dfe0b90af564..f7833f5cb2113107c1517c582c323951e5600388 100644 (file)
--- a/plugins/sudoers/auth/securid5.c
+++ b/plugins/sudoers/auth/securid5.c
@@ -29,14 +29,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/sia.c b/plugins/sudoers/auth/sia.c
index 610b789d3704c93a8e765559b5553be52b6d4f2a..4b78ca512fa7add57748ce03aa4a112b5efb2643 100644 (file)
--- a/plugins/sudoers/auth/sia.c
+++ b/plugins/sudoers/auth/sia.c
@@ -27,14 +27,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/auth/sudo_auth.c b/plugins/sudoers/auth/sudo_auth.c
index ad7c6bfa42c6bb820756baaec3298b491dbb063d..dba71bac88b7a9ac5e2c9e4cae26103938bb0224 100644 (file)
--- a/plugins/sudoers/auth/sudo_auth.c
+++ b/plugins/sudoers/auth/sudo_auth.c
@@ -22,14 +22,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/base64.c b/plugins/sudoers/base64.c
index 403b3dd901a7a00ebfa70a65c7ea2d8f5623d4d2..009ce8e35397b1ff4572d284f09dca7bde4666a2 100644 (file)
--- a/plugins/sudoers/base64.c
+++ b/plugins/sudoers/base64.c
@@ -20,14 +20,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/boottime.c b/plugins/sudoers/boottime.c
index e1706fc789c25f2fc17f6241c64c14a062d1783f..a151f56edee08e4bd00f27d88c9bfa0bab9ebb5f 100644 (file)
--- a/plugins/sudoers/boottime.c
+++ b/plugins/sudoers/boottime.c
@@ -20,14 +20,8 @@
 #include <sys/time.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/plugins/sudoers/check.c b/plugins/sudoers/check.c
index b152eb6893e81238ee97b6d58ef0fe8a90e31dce..26168ba264d427493e3e2dc17d861bb76fae8de8 100644 (file)
--- a/plugins/sudoers/check.c
+++ b/plugins/sudoers/check.c
@@ -24,14 +24,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
index f27aad82587447c4023f792d3a4a876097e36176..723d4b1bb66391428ad128119caea39c62a493e7 100644 (file)
--- a/plugins/sudoers/defaults.c
+++ b/plugins/sudoers/defaults.c
@@ -23,14 +23,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/editor.c b/plugins/sudoers/editor.c
index 5a3e60475f1e788418290b147b24169c95abed86..9bb2f9d5308898a85c4ea4e015dba77d328f96db 100644 (file)
--- a/plugins/sudoers/editor.c
+++ b/plugins/sudoers/editor.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c
index 252657c888fc7730ca08d0f619009132162fe559..8bbe6590af5054978bf68273f9ee079b09fcba17 100644 (file)
--- a/plugins/sudoers/env.c
+++ b/plugins/sudoers/env.c
@@ -24,14 +24,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/find_path.c b/plugins/sudoers/find_path.c
index 64e2e43df25db76c8843665daed48e7b5c807f5c..f3cedba050f68c43e1b51e0f7efd8305373c19dd 100644 (file)
--- a/plugins/sudoers/find_path.c
+++ b/plugins/sudoers/find_path.c
@@ -24,14 +24,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/getdate.c b/plugins/sudoers/getdate.c
index 984253629060a48cb5deccff383b03e55d9d7d85..d3754945db8eafd7b926de6f4f9d67ef07fd46ff 100644 (file)
--- a/plugins/sudoers/getdate.c
+++ b/plugins/sudoers/getdate.c
@@ -29,14 +29,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
@@ -117,7 +111,7 @@ static int  yyerror(const char *s);
 static int     yylex(void);
        int     yyparse(void);
 
-#line 110 "getdate.y"
+#line 104 "getdate.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -125,7 +119,7 @@ typedef union {
     enum _MERIDIAN     Meridian;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 128 "getdate.c"
+#line 122 "getdate.c"
 #define tAGO 257
 #define tDAY 258
 #define tDAYZONE 259
@@ -393,7 +387,7 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 unsigned int yystacksize;
-#line 329 "getdate.y"
+#line 323 "getdate.y"
 
 /* Month and day table. */
 static TABLE const MonthDayTable[] = {
@@ -1015,7 +1009,7 @@ main(int argc, char *argv[])
     /* NOTREACHED */
 }
 #endif /* TEST */
-#line 966 "getdate.c"
+#line 960 "getdate.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1224,37 +1218,37 @@ yyreduce:
     switch (yyn)
     {
 case 3:
-#line 128 "getdate.y"
+#line 122 "getdate.y"
 {
            yyHaveTime++;
        }
 break;
 case 4:
-#line 131 "getdate.y"
+#line 125 "getdate.y"
 {
            yyHaveZone++;
        }
 break;
 case 5:
-#line 134 "getdate.y"
+#line 128 "getdate.y"
 {
            yyHaveDate++;
        }
 break;
 case 6:
-#line 137 "getdate.y"
+#line 131 "getdate.y"
 {
            yyHaveDay++;
        }
 break;
 case 7:
-#line 140 "getdate.y"
+#line 134 "getdate.y"
 {
            yyHaveRel++;
        }
 break;
 case 9:
-#line 146 "getdate.y"
+#line 140 "getdate.y"
 {
            yyHour = yyvsp[-1].Number;
            yyMinutes = 0;
@@ -1263,7 +1257,7 @@ case 9:
        }
 break;
 case 10:
-#line 152 "getdate.y"
+#line 146 "getdate.y"
 {
            yyHour = yyvsp[-3].Number;
            yyMinutes = yyvsp[-1].Number;
@@ -1272,7 +1266,7 @@ case 10:
        }
 break;
 case 11:
-#line 158 "getdate.y"
+#line 152 "getdate.y"
 {
            yyHour = yyvsp[-3].Number;
            yyMinutes = yyvsp[-1].Number;
@@ -1282,7 +1276,7 @@ case 11:
        }
 break;
 case 12:
-#line 165 "getdate.y"
+#line 159 "getdate.y"
 {
            yyHour = yyvsp[-5].Number;
            yyMinutes = yyvsp[-3].Number;
@@ -1291,7 +1285,7 @@ case 12:
        }
 break;
 case 13:
-#line 171 "getdate.y"
+#line 165 "getdate.y"
 {
            yyHour = yyvsp[-5].Number;
            yyMinutes = yyvsp[-3].Number;
@@ -1302,56 +1296,56 @@ case 13:
        }
 break;
 case 14:
-#line 181 "getdate.y"
+#line 175 "getdate.y"
 {
            yyTimezone = yyvsp[0].Number;
            yyDSTmode = DSToff;
        }
 break;
 case 15:
-#line 185 "getdate.y"
+#line 179 "getdate.y"
 {
            yyTimezone = yyvsp[0].Number;
            yyDSTmode = DSTon;
        }
 break;
 case 16:
-#line 190 "getdate.y"
+#line 184 "getdate.y"
 {
            yyTimezone = yyvsp[-1].Number;
            yyDSTmode = DSTon;
        }
 break;
 case 17:
-#line 196 "getdate.y"
+#line 190 "getdate.y"
 {
            yyDayOrdinal = 1;
            yyDayNumber = yyvsp[0].Number;
        }
 break;
 case 18:
-#line 200 "getdate.y"
+#line 194 "getdate.y"
 {
            yyDayOrdinal = 1;
            yyDayNumber = yyvsp[-1].Number;
        }
 break;
 case 19:
-#line 204 "getdate.y"
+#line 198 "getdate.y"
 {
            yyDayOrdinal = yyvsp[-1].Number;
            yyDayNumber = yyvsp[0].Number;
        }
 break;
 case 20:
-#line 210 "getdate.y"
+#line 204 "getdate.y"
 {
            yyMonth = yyvsp[-2].Number;
            yyDay = yyvsp[0].Number;
        }
 break;
 case 21:
-#line 214 "getdate.y"
+#line 208 "getdate.y"
 {
            if (yyvsp[-4].Number >= 100) {
                yyYear = yyvsp[-4].Number;
@@ -1365,7 +1359,7 @@ case 21:
        }
 break;
 case 22:
-#line 225 "getdate.y"
+#line 219 "getdate.y"
 {
            /* ISO 8601 format.  yyyy-mm-dd.  */
            yyYear = yyvsp[-2].Number;
@@ -1374,7 +1368,7 @@ case 22:
        }
 break;
 case 23:
-#line 231 "getdate.y"
+#line 225 "getdate.y"
 {
            /* e.g. 17-JUN-1992.  */
            yyDay = yyvsp[-2].Number;
@@ -1383,14 +1377,14 @@ case 23:
        }
 break;
 case 24:
-#line 237 "getdate.y"
+#line 231 "getdate.y"
 {
            yyMonth = yyvsp[-1].Number;
            yyDay = yyvsp[0].Number;
        }
 break;
 case 25:
-#line 241 "getdate.y"
+#line 235 "getdate.y"
 {
            yyMonth = yyvsp[-3].Number;
            yyDay = yyvsp[-2].Number;
@@ -1398,14 +1392,14 @@ case 25:
        }
 break;
 case 26:
-#line 246 "getdate.y"
+#line 240 "getdate.y"
 {
            yyMonth = yyvsp[0].Number;
            yyDay = yyvsp[-1].Number;
        }
 break;
 case 27:
-#line 250 "getdate.y"
+#line 244 "getdate.y"
 {
            yyMonth = yyvsp[-1].Number;
            yyDay = yyvsp[-2].Number;
@@ -1413,68 +1407,68 @@ case 27:
        }
 break;
 case 28:
-#line 257 "getdate.y"
+#line 251 "getdate.y"
 {
            yyRelSeconds = -yyRelSeconds;
            yyRelMonth = -yyRelMonth;
        }
 break;
 case 30:
-#line 264 "getdate.y"
+#line 258 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
        }
 break;
 case 31:
-#line 267 "getdate.y"
+#line 261 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
        }
 break;
 case 32:
-#line 270 "getdate.y"
+#line 264 "getdate.y"
 {
            yyRelSeconds += yyvsp[0].Number * 60L;
        }
 break;
 case 33:
-#line 273 "getdate.y"
+#line 267 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number;
        }
 break;
 case 34:
-#line 276 "getdate.y"
+#line 270 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number;
        }
 break;
 case 35:
-#line 279 "getdate.y"
+#line 273 "getdate.y"
 {
            yyRelSeconds++;
        }
 break;
 case 36:
-#line 282 "getdate.y"
+#line 276 "getdate.y"
 {
            yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
        }
 break;
 case 37:
-#line 285 "getdate.y"
+#line 279 "getdate.y"
 {
            yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
        }
 break;
 case 38:
-#line 288 "getdate.y"
+#line 282 "getdate.y"
 {
            yyRelMonth += yyvsp[0].Number;
        }
 break;
 case 39:
-#line 293 "getdate.y"
+#line 287 "getdate.y"
 {
            if (yyHaveTime && yyHaveDate && !yyHaveRel)
                yyYear = yyvsp[0].Number;
@@ -1502,18 +1496,18 @@ case 39:
        }
 break;
 case 40:
-#line 320 "getdate.y"
+#line 314 "getdate.y"
 {
            yyval.Meridian = MER24;
        }
 break;
 case 41:
-#line 323 "getdate.y"
+#line 317 "getdate.y"
 {
            yyval.Meridian = yyvsp[0].Meridian;
        }
 break;
-#line 1464 "getdate.c"
+#line 1458 "getdate.c"
     }
     yyssp -= yym;
     yystate = *yyssp;

diff --git a/plugins/sudoers/getdate.y b/plugins/sudoers/getdate.y
index cd32b94498e17c20269546c5fff1946c2924aaca..d03eb1b7543903bcd57ba8e8cb24690d4eae2161 100644 (file)
--- a/plugins/sudoers/getdate.y
+++ b/plugins/sudoers/getdate.y
@@ -17,14 +17,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/getspwuid.c b/plugins/sudoers/getspwuid.c
index 95f959b732c6b6a69b3196387083652bd4810f86..9ac07a2126bbc6989d929837f7de903ad9cef5e7 100644 (file)
--- a/plugins/sudoers/getspwuid.c
+++ b/plugins/sudoers/getspwuid.c
@@ -24,14 +24,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c
index b41c232a4782f9382661922f95eabfc34f4dc158..36dd38c2f9e9071cdc123cee42e24617449f4f6f 100644 (file)
--- a/plugins/sudoers/gram.c
+++ b/plugins/sudoers/gram.c
@@ -64,14 +64,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
@@ -114,7 +108,7 @@ static bool add_userspec(struct member *, struct privilege *);
 static struct defaults *new_default(char *, char *, int);
 static struct member *new_member(char *, int);
 static struct sudo_digest *new_digest(int, const char *);
-#line 81 "gram.y"
+#line 75 "gram.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -132,7 +126,7 @@ typedef union {
     int tok;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 135 "gram.c"
+#line 129 "gram.c"
 #define COMMAND 257
 #define ALIAS 258
 #define DEFVAR 259
@@ -709,7 +703,7 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 unsigned int yystacksize;
-#line 858 "gram.y"
+#line 852 "gram.y"
 void
 sudoerserror(const char *s)
 {
@@ -991,7 +985,7 @@ init_parser(const char *path, bool quiet)
 
     debug_return_bool(rval);
 }
-#line 942 "gram.c"
+#line 936 "gram.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1200,23 +1194,23 @@ yyreduce:
     switch (yyn)
     {
 case 1:
-#line 173 "gram.y"
+#line 167 "gram.y"
 { ; }
 break;
 case 5:
-#line 181 "gram.y"
+#line 175 "gram.y"
 {
                            ;
                        }
 break;
 case 6:
-#line 184 "gram.y"
+#line 178 "gram.y"
 {
                            yyerrok;
                        }
 break;
 case 7:
-#line 187 "gram.y"
+#line 181 "gram.y"
 {
                            if (!add_userspec(yyvsp[-1].member, yyvsp[0].privilege)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1225,31 +1219,31 @@ case 7:
                        }
 break;
 case 8:
-#line 193 "gram.y"
+#line 187 "gram.y"
 {
                            ;
                        }
 break;
 case 9:
-#line 196 "gram.y"
+#line 190 "gram.y"
 {
                            ;
                        }
 break;
 case 10:
-#line 199 "gram.y"
+#line 193 "gram.y"
 {
                            ;
                        }
 break;
 case 11:
-#line 202 "gram.y"
+#line 196 "gram.y"
 {
                            ;
                        }
 break;
 case 12:
-#line 205 "gram.y"
+#line 199 "gram.y"
 {
                            if (!add_defaults(DEFAULTS, NULL, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1258,7 +1252,7 @@ case 12:
                        }
 break;
 case 13:
-#line 211 "gram.y"
+#line 205 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_USER, yyvsp[-1].member, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1267,7 +1261,7 @@ case 13:
                        }
 break;
 case 14:
-#line 217 "gram.y"
+#line 211 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_RUNAS, yyvsp[-1].member, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1276,7 +1270,7 @@ case 14:
                        }
 break;
 case 15:
-#line 223 "gram.y"
+#line 217 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_HOST, yyvsp[-1].member, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1285,7 +1279,7 @@ case 15:
                        }
 break;
 case 16:
-#line 229 "gram.y"
+#line 223 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_CMND, yyvsp[-1].member, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1294,14 +1288,14 @@ case 16:
                        }
 break;
 case 18:
-#line 238 "gram.y"
+#line 232 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].defaults, yyvsp[0].defaults, entries);
                            yyval.defaults = yyvsp[-2].defaults;
                        }
 break;
 case 19:
-#line 244 "gram.y"
+#line 238 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, true);
                            if (yyval.defaults == NULL) {
@@ -1311,7 +1305,7 @@ case 19:
                        }
 break;
 case 20:
-#line 251 "gram.y"
+#line 245 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, false);
                            if (yyval.defaults == NULL) {
@@ -1321,7 +1315,7 @@ case 20:
                        }
 break;
 case 21:
-#line 258 "gram.y"
+#line 252 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, true);
                            if (yyval.defaults == NULL) {
@@ -1331,7 +1325,7 @@ case 21:
                        }
 break;
 case 22:
-#line 265 "gram.y"
+#line 259 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '+');
                            if (yyval.defaults == NULL) {
@@ -1341,7 +1335,7 @@ case 22:
                        }
 break;
 case 23:
-#line 272 "gram.y"
+#line 266 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '-');
                            if (yyval.defaults == NULL) {
@@ -1351,14 +1345,14 @@ case 23:
                        }
 break;
 case 25:
-#line 282 "gram.y"
+#line 276 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].privilege, yyvsp[0].privilege, entries);
                            yyval.privilege = yyvsp[-2].privilege;
                        }
 break;
 case 26:
-#line 288 "gram.y"
+#line 282 "gram.y"
 {
                            struct privilege *p = calloc(1, sizeof(*p));
                            if (p == NULL) {
@@ -1372,21 +1366,21 @@ case 26:
                        }
 break;
 case 27:
-#line 301 "gram.y"
+#line 295 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 28:
-#line 305 "gram.y"
+#line 299 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 29:
-#line 311 "gram.y"
+#line 305 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -1396,7 +1390,7 @@ case 29:
                        }
 break;
 case 30:
-#line 318 "gram.y"
+#line 312 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -1406,7 +1400,7 @@ case 30:
                        }
 break;
 case 31:
-#line 325 "gram.y"
+#line 319 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                            if (yyval.member == NULL) {
@@ -1416,7 +1410,7 @@ case 31:
                        }
 break;
 case 32:
-#line 332 "gram.y"
+#line 326 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NTWKADDR);
                            if (yyval.member == NULL) {
@@ -1426,7 +1420,7 @@ case 32:
                        }
 break;
 case 33:
-#line 339 "gram.y"
+#line 333 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                            if (yyval.member == NULL) {
@@ -1436,7 +1430,7 @@ case 33:
                        }
 break;
 case 35:
-#line 349 "gram.y"
+#line 343 "gram.y"
 {
                            struct cmndspec *prev;
                            prev = HLTQ_LAST(yyvsp[-2].cmndspec, cmndspec, entries);
@@ -1480,7 +1474,7 @@ case 35:
                        }
 break;
 case 36:
-#line 392 "gram.y"
+#line 386 "gram.y"
 {
                            struct cmndspec *cs = calloc(1, sizeof(*cs));
                            if (cs == NULL) {
@@ -1529,7 +1523,7 @@ case 36:
                        }
 break;
 case 37:
-#line 440 "gram.y"
+#line 434 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA224, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1539,7 +1533,7 @@ case 37:
                        }
 break;
 case 38:
-#line 447 "gram.y"
+#line 441 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA256, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1549,7 +1543,7 @@ case 38:
                        }
 break;
 case 39:
-#line 454 "gram.y"
+#line 448 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA384, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1559,7 +1553,7 @@ case 39:
                        }
 break;
 case 40:
-#line 461 "gram.y"
+#line 455 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA512, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1569,13 +1563,13 @@ case 40:
                        }
 break;
 case 41:
-#line 470 "gram.y"
+#line 464 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                        }
 break;
 case 42:
-#line 473 "gram.y"
+#line 467 "gram.y"
 {
                            if (yyvsp[0].member->type != COMMAND) {
                                sudoerserror(N_("a digest requires a path name"));
@@ -1587,127 +1581,127 @@ case 42:
                        }
 break;
 case 43:
-#line 484 "gram.y"
+#line 478 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 44:
-#line 488 "gram.y"
+#line 482 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 45:
-#line 494 "gram.y"
+#line 488 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 46:
-#line 499 "gram.y"
+#line 493 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 47:
-#line 504 "gram.y"
+#line 498 "gram.y"
 {
                            yyval.seinfo.role = NULL;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 48:
-#line 508 "gram.y"
+#line 502 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[0].string;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 49:
-#line 512 "gram.y"
+#line 506 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[0].string;
                            yyval.seinfo.role = NULL;
                        }
 break;
 case 50:
-#line 516 "gram.y"
+#line 510 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[-1].string;
                            yyval.seinfo.type = yyvsp[0].string;
                        }
 break;
 case 51:
-#line 520 "gram.y"
+#line 514 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[-1].string;
                            yyval.seinfo.role = yyvsp[0].string;
                        }
 break;
 case 52:
-#line 526 "gram.y"
+#line 520 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 53:
-#line 530 "gram.y"
+#line 524 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 54:
-#line 535 "gram.y"
+#line 529 "gram.y"
 {
                            yyval.privinfo.privs = NULL;
                            yyval.privinfo.limitprivs = NULL;
                        }
 break;
 case 55:
-#line 539 "gram.y"
+#line 533 "gram.y"
 {
                            yyval.privinfo.privs = yyvsp[0].string;
                            yyval.privinfo.limitprivs = NULL;
                        }
 break;
 case 56:
-#line 543 "gram.y"
+#line 537 "gram.y"
 {
                            yyval.privinfo.privs = NULL;
                            yyval.privinfo.limitprivs = yyvsp[0].string;
                        }
 break;
 case 57:
-#line 547 "gram.y"
+#line 541 "gram.y"
 {
                            yyval.privinfo.privs = yyvsp[-1].string;
                            yyval.privinfo.limitprivs = yyvsp[0].string;
                        }
 break;
 case 58:
-#line 551 "gram.y"
+#line 545 "gram.y"
 {
                            yyval.privinfo.limitprivs = yyvsp[-1].string;
                            yyval.privinfo.privs = yyvsp[0].string;
                        }
 break;
 case 59:
-#line 557 "gram.y"
+#line 551 "gram.y"
 {
                            yyval.runas = NULL;
                        }
 break;
 case 60:
-#line 560 "gram.y"
+#line 554 "gram.y"
 {
                            yyval.runas = yyvsp[-1].runas;
                        }
 break;
 case 61:
-#line 565 "gram.y"
+#line 559 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas != NULL) {
@@ -1725,7 +1719,7 @@ case 61:
                        }
 break;
 case 62:
-#line 580 "gram.y"
+#line 574 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas == NULL) {
@@ -1737,7 +1731,7 @@ case 62:
                        }
 break;
 case 63:
-#line 589 "gram.y"
+#line 583 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas == NULL) {
@@ -1749,7 +1743,7 @@ case 63:
                        }
 break;
 case 64:
-#line 598 "gram.y"
+#line 592 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas == NULL) {
@@ -1761,7 +1755,7 @@ case 64:
                        }
 break;
 case 65:
-#line 607 "gram.y"
+#line 601 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas != NULL) {
@@ -1779,86 +1773,86 @@ case 65:
                        }
 break;
 case 66:
-#line 624 "gram.y"
+#line 618 "gram.y"
 {
                            yyval.tag.log_input = yyval.tag.log_output = yyval.tag.noexec =
                                yyval.tag.nopasswd = yyval.tag.send_mail = yyval.tag.setenv = UNSPEC;
                        }
 break;
 case 67:
-#line 628 "gram.y"
+#line 622 "gram.y"
 {
                            yyval.tag.nopasswd = true;
                        }
 break;
 case 68:
-#line 631 "gram.y"
+#line 625 "gram.y"
 {
                            yyval.tag.nopasswd = false;
                        }
 break;
 case 69:
-#line 634 "gram.y"
+#line 628 "gram.y"
 {
                            yyval.tag.noexec = true;
                        }
 break;
 case 70:
-#line 637 "gram.y"
+#line 631 "gram.y"
 {
                            yyval.tag.noexec = false;
                        }
 break;
 case 71:
-#line 640 "gram.y"
+#line 634 "gram.y"
 {
                            yyval.tag.setenv = true;
                        }
 break;
 case 72:
-#line 643 "gram.y"
+#line 637 "gram.y"
 {
                            yyval.tag.setenv = false;
                        }
 break;
 case 73:
-#line 646 "gram.y"
+#line 640 "gram.y"
 {
                            yyval.tag.log_input = true;
                        }
 break;
 case 74:
-#line 649 "gram.y"
+#line 643 "gram.y"
 {
                            yyval.tag.log_input = false;
                        }
 break;
 case 75:
-#line 652 "gram.y"
+#line 646 "gram.y"
 {
                            yyval.tag.log_output = true;
                        }
 break;
 case 76:
-#line 655 "gram.y"
+#line 649 "gram.y"
 {
                            yyval.tag.log_output = false;
                        }
 break;
 case 77:
-#line 658 "gram.y"
+#line 652 "gram.y"
 {
                            yyval.tag.send_mail = true;
                        }
 break;
 case 78:
-#line 661 "gram.y"
+#line 655 "gram.y"
 {
                            yyval.tag.send_mail = false;
                        }
 break;
 case 79:
-#line 666 "gram.y"
+#line 660 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -1868,7 +1862,7 @@ case 79:
                        }
 break;
 case 80:
-#line 673 "gram.y"
+#line 667 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -1878,7 +1872,7 @@ case 80:
                        }
 break;
 case 81:
-#line 680 "gram.y"
+#line 674 "gram.y"
 {
                            struct sudo_command *c = calloc(1, sizeof(*c));
                            if (c == NULL) {
@@ -1896,7 +1890,7 @@ case 81:
                        }
 break;
 case 84:
-#line 701 "gram.y"
+#line 695 "gram.y"
 {
                            const char *s;
                            if ((s = alias_add(yyvsp[-2].string, HOSTALIAS, yyvsp[0].member)) != NULL) {
@@ -1906,14 +1900,14 @@ case 84:
                        }
 break;
 case 86:
-#line 711 "gram.y"
+#line 705 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 89:
-#line 721 "gram.y"
+#line 715 "gram.y"
 {
                            const char *s;
                            if ((s = alias_add(yyvsp[-2].string, CMNDALIAS, yyvsp[0].member)) != NULL) {
@@ -1923,14 +1917,14 @@ case 89:
                        }
 break;
 case 91:
-#line 731 "gram.y"
+#line 725 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 94:
-#line 741 "gram.y"
+#line 735 "gram.y"
 {
                            const char *s;
                            if ((s = alias_add(yyvsp[-2].string, RUNASALIAS, yyvsp[0].member)) != NULL) {
@@ -1940,7 +1934,7 @@ case 94:
                        }
 break;
 case 97:
-#line 754 "gram.y"
+#line 748 "gram.y"
 {
                            const char *s;
                            if ((s = alias_add(yyvsp[-2].string, USERALIAS, yyvsp[0].member)) != NULL) {
@@ -1950,28 +1944,28 @@ case 97:
                        }
 break;
 case 99:
-#line 764 "gram.y"
+#line 758 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 100:
-#line 770 "gram.y"
+#line 764 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 101:
-#line 774 "gram.y"
+#line 768 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 102:
-#line 780 "gram.y"
+#line 774 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -1981,7 +1975,7 @@ case 102:
                        }
 break;
 case 103:
-#line 787 "gram.y"
+#line 781 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -1991,7 +1985,7 @@ case 103:
                        }
 break;
 case 104:
-#line 794 "gram.y"
+#line 788 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                            if (yyval.member == NULL) {
@@ -2001,7 +1995,7 @@ case 104:
                        }
 break;
 case 105:
-#line 801 "gram.y"
+#line 795 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, USERGROUP);
                            if (yyval.member == NULL) {
@@ -2011,7 +2005,7 @@ case 105:
                        }
 break;
 case 106:
-#line 808 "gram.y"
+#line 802 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                            if (yyval.member == NULL) {
@@ -2021,28 +2015,28 @@ case 106:
                        }
 break;
 case 108:
-#line 818 "gram.y"
+#line 812 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 109:
-#line 824 "gram.y"
+#line 818 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 110:
-#line 828 "gram.y"
+#line 822 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 111:
-#line 834 "gram.y"
+#line 828 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -2052,7 +2046,7 @@ case 111:
                        }
 break;
 case 112:
-#line 841 "gram.y"
+#line 835 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -2062,7 +2056,7 @@ case 112:
                        }
 break;
 case 113:
-#line 848 "gram.y"
+#line 842 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                            if (yyval.member == NULL) {
@@ -2071,7 +2065,7 @@ case 113:
                            }
                        }
 break;
-#line 2022 "gram.c"
+#line 2016 "gram.c"
     }
     yyssp -= yym;
     yystate = *yyssp;

diff --git a/plugins/sudoers/gram.y b/plugins/sudoers/gram.y
index a6d2f70be294c62d45889b5f35338b8384fcd701..9855acc2bf027c3d1b6821255efc6729054e3c91 100644 (file)
--- a/plugins/sudoers/gram.y
+++ b/plugins/sudoers/gram.y
@@ -26,14 +26,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/group_plugin.c b/plugins/sudoers/group_plugin.c
index 7afc357d1281fb60fb5896d6aefce0023fae0d3c..705f520870437af6fcfed05ec4bc29539fc97add 100644 (file)
--- a/plugins/sudoers/group_plugin.c
+++ b/plugins/sudoers/group_plugin.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/interfaces.c b/plugins/sudoers/interfaces.c
index f077bea2680131c9d8e30d1d5094596ba31456dc..822ac18907be7778f6f27782a419bf26e0b52a43 100644 (file)
--- a/plugins/sudoers/interfaces.c
+++ b/plugins/sudoers/interfaces.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c
index 6d9a5afcb30bfe8e57ddf7c9644be99b47865169..eec727d18a99b3e4c4c6ad0a471d0bfddfeaa66b 100644 (file)
--- a/plugins/sudoers/iolog.c
+++ b/plugins/sudoers/iolog.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/iolog_path.c b/plugins/sudoers/iolog_path.c
index 1392f30a8d74605fc15453bfefecd0b4f8756452..e391462d4342b3b0b557327fedcab6957304b243 100644 (file)
--- a/plugins/sudoers/iolog_path.c
+++ b/plugins/sudoers/iolog_path.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
index 15f9efdb25fe37613d2768905594e315379bb564..2cdaffe8740e4b637c76a0eef3751da076bede38 100644 (file)
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -22,14 +22,8 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/linux_audit.c b/plugins/sudoers/linux_audit.c
index 076500bd795d986c680158eea3c11fda7f230b0c..187d46a587ee60b063131129c65e74a1b007c30f 100644 (file)
--- a/plugins/sudoers/linux_audit.c
+++ b/plugins/sudoers/linux_audit.c
@@ -20,14 +20,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>

diff --git a/plugins/sudoers/locale.c b/plugins/sudoers/locale.c
index d2810e63e066e7b73a7b0e5691d2bd9d8fa5f04b..c63a1d8aaccb119d0484a9e83c3d818613d7ec46 100644 (file)
--- a/plugins/sudoers/locale.c
+++ b/plugins/sudoers/locale.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
index 7fd0db99b971d497258c47279e48a9d356939fe4..c637c5ab769764bddb1d837e31815a93e897c002 100644 (file)
--- a/plugins/sudoers/logging.c
+++ b/plugins/sudoers/logging.c
@@ -29,14 +29,8 @@
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/logwrap.c b/plugins/sudoers/logwrap.c
index 67bc7e96e24d65dbc2865a7f44e1bf66f3726d40..4fe26b7f559d62efcc54c4f31641c08fcf15ccb8 100644 (file)
--- a/plugins/sudoers/logwrap.c
+++ b/plugins/sudoers/logwrap.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/match.c b/plugins/sudoers/match.c
index 40e6cebb79cee101380659748cb4b2a2c48106f4..4804e91a1162773e5b0e043291103bea696c2d58 100644 (file)
--- a/plugins/sudoers/match.c
+++ b/plugins/sudoers/match.c
@@ -29,14 +29,8 @@
 # include <sys/systeminfo.h>
 #endif
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/match_addr.c b/plugins/sudoers/match_addr.c
index d518bf3ca5ca7a6ce9ca707affd35e8b60983e47..f79a84d9ce15e4e0fdb9644ce0cdbb637833b223 100644 (file)
--- a/plugins/sudoers/match_addr.c
+++ b/plugins/sudoers/match_addr.c
@@ -26,14 +26,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c
index fdb7b3098668b2938bfc51095ac0de11932ae672..d8162dc104fa94976ab9b193891048347363a896 100644 (file)
--- a/plugins/sudoers/parse.c
+++ b/plugins/sudoers/parse.c
@@ -20,14 +20,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
index aeb4989a53cd5ad0f9ba128f5387a6221909394e..ecb9838bad15c53ab55a018eb4dbf4fdb664b1cc 100644 (file)
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 #include <netinet/in.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/prompt.c b/plugins/sudoers/prompt.c
index a8950876df28045d72d2923ad204b1b4511a33da..749fac50b5281cdf2f7e3d79ea332f623a55f999 100644 (file)
--- a/plugins/sudoers/prompt.c
+++ b/plugins/sudoers/prompt.c
@@ -23,14 +23,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/pwutil.c b/plugins/sudoers/pwutil.c
index 6e2e9cc3b72abc943a2328a1366e0c789a02ded1..9c516a0ee30c460319c90b9658199e7f7313ac03 100644 (file)
--- a/plugins/sudoers/pwutil.c
+++ b/plugins/sudoers/pwutil.c
@@ -23,14 +23,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/pwutil_impl.c b/plugins/sudoers/pwutil_impl.c
index 13fae1e6dddeac1accf824cf5fbb6474cc52d75c..0bdf7bec7db8ca6af6732642b10963998cce7d32 100644 (file)
--- a/plugins/sudoers/pwutil_impl.c
+++ b/plugins/sudoers/pwutil_impl.c
@@ -23,14 +23,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/redblack.c b/plugins/sudoers/redblack.c
index 789f8015ebe1fc9e675e33e72099213321fef24c..82103cd37454d9b3a0244875a1bca80086305540 100644 (file)
--- a/plugins/sudoers/redblack.c
+++ b/plugins/sudoers/redblack.c
@@ -45,14 +45,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 
 #include "sudoers.h"
 #include "redblack.h"

diff --git a/plugins/sudoers/regress/check_symbols/check_symbols.c b/plugins/sudoers/regress/check_symbols/check_symbols.c
index 792ddfe0bd58684ec4a31f30c3b97d6a1cc56d5d..4edb1ea57497eac4d8295bd089ed05fed64e7aef 100644 (file)
--- a/plugins/sudoers/regress/check_symbols/check_symbols.c
+++ b/plugins/sudoers/regress/check_symbols/check_symbols.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/regress/iolog_path/check_iolog_path.c b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
index c24b3f95fcafdbb4fedb9c9e4e8ca841b3a1745a..d93e8eab580bf2348a8738885f5d7a32c7f45244 100644 (file)
--- a/plugins/sudoers/regress/iolog_path/check_iolog_path.c
+++ b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/regress/logging/check_wrap.c b/plugins/sudoers/regress/logging/check_wrap.c
index 90b14e6fae019f7da0c552bdc63908b39d43033b..2c38213daa14f0cda90b2b84f5a6e3d133e57ffd 100644 (file)
--- a/plugins/sudoers/regress/logging/check_wrap.c
+++ b/plugins/sudoers/regress/logging/check_wrap.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/regress/parser/check_addr.c b/plugins/sudoers/regress/parser/check_addr.c
index bf82a23b45d06619134c40e61efb39fc703e0fa3..2a349efd2509bf9b5057fa2bba0b1d3d05473739 100644 (file)
--- a/plugins/sudoers/regress/parser/check_addr.c
+++ b/plugins/sudoers/regress/parser/check_addr.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <stdarg.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

diff --git a/plugins/sudoers/regress/parser/check_base64.c b/plugins/sudoers/regress/parser/check_base64.c
index d7dd3276b140692f2214eb87610d3e76a53d8c53..4281383812023b025742d97853b880749357dc61 100644 (file)
--- a/plugins/sudoers/regress/parser/check_base64.c
+++ b/plugins/sudoers/regress/parser/check_base64.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/regress/parser/check_digest.c b/plugins/sudoers/regress/parser/check_digest.c
index 6289fa0658d1ecacc3f0d911141eb07e20919448..87a33d97e71673804ee304123ef9511ccdd4f53e 100644 (file)
--- a/plugins/sudoers/regress/parser/check_digest.c
+++ b/plugins/sudoers/regress/parser/check_digest.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/regress/parser/check_fill.c b/plugins/sudoers/regress/parser/check_fill.c
index 97eed7608426dfa0fb93fe634ecfb8b7fcb28d28..ab3200d3986d62b8503e96f63aa8e2892e7477b5 100644 (file)
--- a/plugins/sudoers/regress/parser/check_fill.c
+++ b/plugins/sudoers/regress/parser/check_fill.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/plugins/sudoers/regress/parser/check_hexchar.c b/plugins/sudoers/regress/parser/check_hexchar.c
index 558f36c8c0202932693e5aaa93cf84b141da546f..22229dbe4f30e336f705894ee3196661eb13109e 100644 (file)
--- a/plugins/sudoers/regress/parser/check_hexchar.c
+++ b/plugins/sudoers/regress/parser/check_hexchar.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/set_perms.c b/plugins/sudoers/set_perms.c
index 6b073c7e66f647bb5d0950a598facea1cd3532a0..1a27b0a8bd998c8570e42650bdf753686571d2f9 100644 (file)
--- a/plugins/sudoers/set_perms.c
+++ b/plugins/sudoers/set_perms.c
@@ -23,14 +23,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/sssd.c b/plugins/sudoers/sssd.c
index 1effdd68430137c7962a2a0664f218411ca904c7..3931fc1174c136ccebb0d08a016ae1b672d4b6da 100644 (file)
--- a/plugins/sudoers/sssd.c
+++ b/plugins/sudoers/sssd.c
@@ -25,14 +25,8 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/sudo_nss.c b/plugins/sudoers/sudo_nss.c
index 2065d7baa04e970da7ac50b61ba666337937427a..5e0ee65e0cf64780b35b4433d0dbf1f1b9cc899d 100644 (file)
--- a/plugins/sudoers/sudo_nss.c
+++ b/plugins/sudoers/sudo_nss.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/sudo_printf.c b/plugins/sudoers/sudo_printf.c
index 0a23b234b17a6ef120adc0b7c20526ac2bc8c8b7..e5f02fb329d30daaa9ab4798bb1d7ca7b02438ab 100644 (file)
--- a/plugins/sudoers/sudo_printf.c
+++ b/plugins/sudoers/sudo_printf.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <stdarg.h>
 #include <errno.h>
 

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index 8ef7f46c95e7f772d6a43959670fd523d4805e97..68ff7fa33de2448e8325bd0432653af0117f2fca 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -29,14 +29,8 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/sudoers_debug.c b/plugins/sudoers/sudoers_debug.c
index 8eab1b0425c37afe6252d9658483e98a7d34eade..c1781313650751d7499c26f3411466d43314cf67 100644 (file)
--- a/plugins/sudoers/sudoers_debug.c
+++ b/plugins/sudoers/sudoers_debug.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index 2b9d31e3995feb1816a064d1311d7ca0c237ae89..04f42fafe661875fa4edca40cbb62a43bc168a46 100644 (file)
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -23,14 +23,8 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index 6ae0119cbdc7d950b5e8440d5e27f09db5aee1a1..4cbc9ee3e585f821d11061232d2b2961b10aab49 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -27,14 +27,8 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/timestamp.c b/plugins/sudoers/timestamp.c
index f64e6eb86be2d770ffd63e41a23b4b9086b89477..933de0220614ccfd9adb5eac41678d14890d3d53 100644 (file)
--- a/plugins/sudoers/timestamp.c
+++ b/plugins/sudoers/timestamp.c
@@ -20,14 +20,8 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/timestr.c b/plugins/sudoers/timestr.c
index e69301d9a33b16a86de58e41b232b6eded4649d9..434640d653e3183dbd7a6a60f61232f52b4605de 100644 (file)
--- a/plugins/sudoers/timestr.c
+++ b/plugins/sudoers/timestr.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #include <time.h>
 
 #include "sudo_compat.h"

diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index e1e3c959ec83ed5600dfbd4203f1c20bf145bf90..09dd634e7bb2c8e29862dc244add615676422974 100644 (file)
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -1962,14 +1962,8 @@ char *yytext;
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
index ff72806ec74f2abc1b9e1a5ac74f0e969502c222..53eb4150ac9eeea1440ac9b7db7fb738cde35357 100644 (file)
--- a/plugins/sudoers/toke.l
+++ b/plugins/sudoers/toke.l
@@ -28,14 +28,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/toke_util.c b/plugins/sudoers/toke_util.c
index a3f19bc982e423ac96aa60974caa52d1d7938548..a91225e4f7743b119b64fd5ebd4a721d81d5b501 100644 (file)
--- a/plugins/sudoers/toke_util.c
+++ b/plugins/sudoers/toke_util.c
@@ -26,14 +26,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/tsgetgrpw.c b/plugins/sudoers/tsgetgrpw.c
index f752bfcd4ad67732cdda0f0581a5d58173e551b1..3a68694eb3606aab58602041e75183b828ac189f 100644 (file)
--- a/plugins/sudoers/tsgetgrpw.c
+++ b/plugins/sudoers/tsgetgrpw.c
@@ -25,14 +25,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 21bc30b814ba41a5e70f7932a554c62d96931f59..35533b2739314ffd1671cafb1dec34a789e5885f 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -39,14 +39,8 @@
 #endif
 #include <sys/wait.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/sudoers/visudo_json.c b/plugins/sudoers/visudo_json.c
index c45eb4bad2fe6ca53cb36fac23ef0db916c6932b..41ce43aac6204c6dfa0d6ba0a0cbeef0726ca6b8 100644 (file)
--- a/plugins/sudoers/visudo_json.c
+++ b/plugins/sudoers/visudo_json.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/plugins/system_group/system_group.c b/plugins/system_group/system_group.c
index 270f663c52a3c8ffe0c719978d171b190da41b01..7ac02d45c2df1ed9f19dfd5450ed24d348e7a099 100644 (file)
--- a/plugins/system_group/system_group.c
+++ b/plugins/system_group/system_group.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

diff --git a/src/conversation.c b/src/conversation.c
index 15870690f32452400d1a3b8adb216b7d68799828..3fa6f1fe8535e3e2fd3342bb465ae93d7f9797d3 100644 (file)
--- a/src/conversation.c
+++ b/src/conversation.c
@@ -22,14 +22,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/env_hooks.c b/src/env_hooks.c
index 5917a08489cf534842a232bbc9cd56dee015368d..a39ee8b2fc6364e398b93f2a2bf1ebaadd9b13f5 100644 (file)
--- a/src/env_hooks.c
+++ b/src/env_hooks.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/exec.c b/src/exec.c
index 30a47d39298fa0662d30d9d37d1bc20a7e2f428f..440755c32066e6b599201a5bc331e351a8b3d6aa 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -23,14 +23,8 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/exec_common.c b/src/exec_common.c
index d2162183c2cc023a81360583a0598dfb812e81aa..a532901575e303d6ca1969988ac7d1d6a45b84c8 100644 (file)
--- a/src/exec_common.c
+++ b/src/exec_common.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/exec_pty.c b/src/exec_pty.c
index d6e2d53c186bcbebd81b893099d6bcb2e34ff538..558434e389c682e56adffcc1d8e79e00111cb7ad 100644 (file)
--- a/src/exec_pty.c
+++ b/src/exec_pty.c
@@ -22,14 +22,8 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/get_pty.c b/src/get_pty.c
index 87af29580411b501b9daf6be52c721a5c681201d..86defe0ba11ba5160ed5ed0e8476289a5c357700 100644 (file)
--- a/src/get_pty.c
+++ b/src/get_pty.c
@@ -24,14 +24,8 @@
 #include <sys/stropts.h>
 #endif /* HAVE_SYS_STROPTS_H */
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/hooks.c b/src/hooks.c
index dd305a340a68a6dc5958f24e5dd6e5da4bbfcb4c..4bd7da4402dad5372b383a49065c285ccb23270c 100644 (file)
--- a/src/hooks.c
+++ b/src/hooks.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/load_plugins.c b/src/load_plugins.c
index 169374c434ed9690dc625c3e45b9033596b1b3b0..40655f33a369e2f3600c0454f349be593575d482 100644 (file)
--- a/src/load_plugins.c
+++ b/src/load_plugins.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/net_ifs.c b/src/net_ifs.c
index 7c3285ef86193cfb94866deb85ba8d267ce9c79d..d3b3bda942dcf52d53c2662ee7511b5b0f26ea10 100644 (file)
--- a/src/net_ifs.c
+++ b/src/net_ifs.c
@@ -38,14 +38,8 @@ struct rtentry;
 # include <sys/sockio.h>
 #endif
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/openbsd.c b/src/openbsd.c
index 6722fbd27a1b18b010b1a44e89cf7ed55f0b6975..585f84cdf5fe0354b4e6ae42f5d2d6674767fd79 100644 (file)
--- a/src/openbsd.c
+++ b/src/openbsd.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/parse_args.c b/src/parse_args.c
index 21b53fc4865928bcd19e80ed1cd5e633678b56f3..b4d3ab57605af214fab153110aaf7a1b9133bdfb 100644 (file)
--- a/src/parse_args.c
+++ b/src/parse_args.c
@@ -23,14 +23,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/preserve_fds.c b/src/preserve_fds.c
index 319010ce2b6ca60034134734a7f075809d54707f..924f84ce2abe2e82d771c0d367dce8a8d4779fec 100644 (file)
--- a/src/preserve_fds.c
+++ b/src/preserve_fds.c
@@ -24,14 +24,8 @@
 # include <sys/select.h>       /* for FD_* macros */
 #endif /* HAVE_SYS_SELECT_H */
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/regress/ttyname/check_ttyname.c b/src/regress/ttyname/check_ttyname.c
index fd3b6efd832a4e04ecc0deb293dba1874301bf98..4c6eb1d8e45558dc08c799a57b157eac5976feb0 100644 (file)
--- a/src/regress/ttyname/check_ttyname.c
+++ b/src/regress/ttyname/check_ttyname.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/signal.c b/src/signal.c
index 541884815cfc1a0cf5274a3ad74d481e83f276ce..95601365cfc53abcdc572336966c184884b1d0c2 100644 (file)
--- a/src/signal.c
+++ b/src/signal.c
@@ -18,14 +18,8 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/solaris.c b/src/solaris.c
index 7702eaaf3bcc63cf5c79174f3132488702968a50..ab96676b190d88bed38085da1af283e6823e80c4 100644 (file)
--- a/src/solaris.c
+++ b/src/solaris.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/sudo.c b/src/sudo.c
index 955c7d6803cf9cb460020e5e7d0792f284e627ff..634700df7d7bb099c9a743a52844c72698af0b86 100644 (file)
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -27,14 +27,8 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/sudo_edit.c b/src/sudo_edit.c
index a94b53d008c7d5e4be4c05bf060f974005b74cb9..8d700a3d1720bb67c802a61f9bb28f6b6cd65ee1 100644 (file)
--- a/src/sudo_edit.c
+++ b/src/sudo_edit.c
@@ -22,14 +22,8 @@
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/tgetpass.c b/src/tgetpass.c
index 95e6b32a838f86d0ab6cab972f4a172e40380234..299dd2c816247a86067fe4fdf74cda287f9ed0a0 100644 (file)
--- a/src/tgetpass.c
+++ b/src/tgetpass.c
@@ -28,14 +28,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/ttyname.c b/src/ttyname.c
index a6bbfccbc32f5ace123ea147c33598690b7dbfa9..8f642d6f4d930a9c99ae028d7e318e8a01233319 100644 (file)
--- a/src/ttyname.c
+++ b/src/ttyname.c
@@ -30,14 +30,8 @@
 # include <sys/sysmacros.h>
 #endif
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

diff --git a/src/utmp.c b/src/utmp.c
index a413f8c0fc451413fa43640b1a260f64739ba1a1..8f0c8209fe3b05060914575b96881ef2b7ea3710 100644 (file)
--- a/src/utmp.c
+++ b/src/utmp.c
@@ -20,14 +20,8 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
+#include <stdlib.h>
+#include <stddef.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */