Don't include <sys/param.h>. We only needed it for MAXPATHLEN,

MAXHOSTNAMELEN and the MIN/MAX macros.  We now use PATH_MAX and
HOST_NAME_MAX throughout without falling back on MAXPATHLEN or
MAXHOSTNAMELEN and define our own MIN/MAX macros as needed.

diff --git a/common/alloc.c b/common/alloc.c
index adc20072307d954af1014167202d7cfa4aeb1b66..09c95f5ebae96b36b3708632a89a0e810ce31cee 100644 (file)
--- a/common/alloc.c
+++ b/common/alloc.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/common/atobool.c b/common/atobool.c
index 6d6b5028938bbabb209eb1d2d6072c37e59ab31a..86b01f583825361d24c863cdbc401c081fd9cf19 100644 (file)
--- a/common/atobool.c
+++ b/common/atobool.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/common/fileops.c b/common/fileops.c
index f99710c0330d96a25ad14bd264bc0e68c59c2655..a23a42a078fb208e1d1c038d9e08b1bba763f570 100644 (file)
--- a/common/fileops.c
+++ b/common/fileops.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/time.h>
 #ifdef HAVE_FLOCK
 # include <sys/file.h>

diff --git a/common/fmt_string.c b/common/fmt_string.c
index 23bc5f72bdf8fe794d7ddc54cfdcf54876b3e5e3..2b8ccc3a164095bf6a81ed23f1199779e99ddbbe 100644 (file)
--- a/common/fmt_string.c
+++ b/common/fmt_string.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/common/lbuf.c b/common/lbuf.c
index 3b20323fc43608d7afbfd81293ed14f76cc52699..bbd095918b6fc5fcd6fe170113097ccdd2b5f692 100644 (file)
--- a/common/lbuf.c
+++ b/common/lbuf.c
@@ -19,7 +19,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/common/secure_path.c b/common/secure_path.c
index 7ae3c19e0927594d6bc05104f3eafa3e289aac87..6eaf2fc850f429e09843bcb5fe37b03eb2360e36 100644 (file)
--- a/common/secure_path.c
+++ b/common/secure_path.c
@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

diff --git a/common/sudo_conf.c b/common/sudo_conf.c
index 92453b7c57119df976619b261ebcabd1c2900e1b..75100e97071fd7ddaaf2062ec27151059b566df4 100644 (file)
--- a/common/sudo_conf.c
+++ b/common/sudo_conf.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/common/sudo_debug.c b/common/sudo_debug.c
index 82301905841780d64499c36c050bc71cbaf1d320..3416cb3d42d5ce5dae01b2f0cb9870dac30f98ef 100644 (file)
--- a/common/sudo_debug.c
+++ b/common/sudo_debug.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <stdio.h>

diff --git a/common/term.c b/common/term.c
index e9c4a499df1949be87bb2067fe411ab4acc53c50..83e130d1d8d6f5023c789213d9c49337b354201b 100644 (file)
--- a/common/term.c
+++ b/common/term.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/compat/closefrom.c b/compat/closefrom.c
index 71777e7b272a113ab48d5b44c717b8991df87813..8ff20f864087c2a87113731f8d07463ae6d00f76 100644 (file)
--- a/compat/closefrom.c
+++ b/compat/closefrom.c
@@ -18,7 +18,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <unistd.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/compat/getcwd.c b/compat/getcwd.c
index 31855046c0d22876e30a184b92b5fe14a349a479..0c0de2bdb037bf769648fb7c280e2b47a854ec0c 100644 (file)
--- a/compat/getcwd.c
+++ b/compat/getcwd.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <errno.h>

diff --git a/compat/glob.c b/compat/glob.c
index cf9a4e2bf66efaa427d84e528e2d92a33167c755..d81fee987cb4aa97f936c0524e0793b4dcf9dfd5 100644 (file)
--- a/compat/glob.c
+++ b/compat/glob.c
@@ -52,7 +52,7 @@
 
 #include <config.h>
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <stdio.h>

diff --git a/compat/snprintf.c b/compat/snprintf.c
index 8a77a5bd7436a883c873da74b7640e5370bdef3b..5fcdb4ec34e073719bd38231bd14700e98ce7fd6 100644 (file)
--- a/compat/snprintf.c
+++ b/compat/snprintf.c
@@ -42,7 +42,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/include/missing.h b/include/missing.h
index 1cd16e5b9743fb598a7e1bbf3e874d18fd9ba783..a060b7cc8336cf66ac648fc48b78bc66a158d256 100644 (file)
--- a/include/missing.h
+++ b/include/missing.h
@@ -82,26 +82,18 @@
 #endif
 
 #ifndef PATH_MAX
-# ifdef MAXPATHLEN
-#  define PATH_MAX             MAXPATHLEN
+# ifdef _POSIX_PATH_MAX
+#  define PATH_MAX             _POSIX_PATH_MAX
 # else
-#  ifdef _POSIX_PATH_MAX
-#   define PATH_MAX            _POSIX_PATH_MAX
-#  else
-#   define PATH_MAX            1024
-#  endif
+#  define PATH_MAX             256
 # endif
 #endif
 
 #ifndef HOST_NAME_MAX
-# ifdef MAXHOSTNAMELEN
-#  define HOST_NAME_MAX                MAXHOSTNAMELEN
+# ifdef _POSIX_HOST_NAME_MAX
+#  define HOST_NAME_MAX                _POSIX_HOST_NAME_MAX
 # else
-#  ifdef _POSIX_HOST_NAME_MAX
-#   define HOST_NAME_MAX       _POSIX_HOST_NAME_MAX
-#  else
-#   define HOST_NAME_MAX       64
-#  endif
+#  define HOST_NAME_MAX                255
 # endif
 #endif
 
@@ -148,7 +140,7 @@
 #endif
 
 /*
- * BSD defines these in <sys/param.h> but others may not.
+ * BSD defines these in <sys/param.h> but we don't include that anymore.
  */
 #ifndef MIN
 # define MIN(a,b) (((a)<(b))?(a):(b))

diff --git a/plugins/sample/sample_plugin.c b/plugins/sample/sample_plugin.c
index a8d4118b791282711ad99e87d7dd1139155ded53..23043d09578ee6114fde11050889c9230fc9079a 100644 (file)
--- a/plugins/sample/sample_plugin.c
+++ b/plugins/sample/sample_plugin.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 

diff --git a/plugins/sample_group/getgrent.c b/plugins/sample_group/getgrent.c
index aa98c1419cea3d3dc94f5de786eb15f10c180ccc..5c7a319b6e88b46d752f8480634b5dbb366ce9d9 100644 (file)
--- a/plugins/sample_group/getgrent.c
+++ b/plugins/sample_group/getgrent.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sample_group/plugin_test.c b/plugins/sample_group/plugin_test.c
index 9d75cb2929ec0fe8ddac39c88193feebeaf65fac..a74deb1c41727555f05b967f2d0c2f2348344a9e 100644 (file)
--- a/plugins/sample_group/plugin_test.c
+++ b/plugins/sample_group/plugin_test.c
@@ -15,7 +15,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/plugins/sample_group/sample_group.c b/plugins/sample_group/sample_group.c
index 2e3628d24172ecf4b4c3aeaeb68367f9c50730e8..1cd238c75adf1f2d140755546418c014cb02fefe 100644 (file)
--- a/plugins/sample_group/sample_group.c
+++ b/plugins/sample_group/sample_group.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 
 #include <stdio.h>

diff --git a/plugins/sudoers/alias.c b/plugins/sudoers/alias.c
index 1079bf2a897f0f258685f1edd7fa7b212a0a1f68..d89e329188465817f0646cf17263bf12dc3206e3 100644 (file)
--- a/plugins/sudoers/alias.c
+++ b/plugins/sudoers/alias.c
@@ -20,7 +20,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/afs.c b/plugins/sudoers/auth/afs.c
index f9693d04f348fa5bcd75737e15fd9c5d0d0575b4..d2ed144e0abf812049c4e035fa8bada054ba1288 100644 (file)
--- a/plugins/sudoers/auth/afs.c
+++ b/plugins/sudoers/auth/afs.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <sys/param.h>
 #include <sys/types.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/plugins/sudoers/auth/aix_auth.c b/plugins/sudoers/auth/aix_auth.c
index 7aa5e273b7d8134d69bd4a5f569e35263c3327db..14c5094eb580ac2ce379f4384497b02fb32c13cb 100644 (file)
--- a/plugins/sudoers/auth/aix_auth.c
+++ b/plugins/sudoers/auth/aix_auth.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/bsdauth.c b/plugins/sudoers/auth/bsdauth.c
index e2cbb05819953a7348badcafb71576f4141df200..2e39d3e5285640d3fa51e066c26930a5668a63b1 100644 (file)
--- a/plugins/sudoers/auth/bsdauth.c
+++ b/plugins/sudoers/auth/bsdauth.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/dce.c b/plugins/sudoers/auth/dce.c
index 467c08fe956cfd7c7a0fe30b112a9ffb3318c88c..bee57dd5ed5ef8503689df6cf496c0a42e6466c4 100644 (file)
--- a/plugins/sudoers/auth/dce.c
+++ b/plugins/sudoers/auth/dce.c
@@ -36,7 +36,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/fwtk.c b/plugins/sudoers/auth/fwtk.c
index 48556237c9f9ad067a15cf8cbd6721fe8b1799a2..aea6dd2c94c29400070df541e2770ea3fcd21a71 100644 (file)
--- a/plugins/sudoers/auth/fwtk.c
+++ b/plugins/sudoers/auth/fwtk.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/kerb5.c b/plugins/sudoers/auth/kerb5.c
index 0ccdb0e75d627a21f8fc005aebeb68b836af8a92..c6cabc6512f28a96f9893e81688b54bc0321c816 100644 (file)
--- a/plugins/sudoers/auth/kerb5.c
+++ b/plugins/sudoers/auth/kerb5.c
@@ -25,7 +25,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c
index 6ec97c6cec4c478b83ebc8ff88cecb638fed2466..5f0386492f9e6faf0d6d184af07c7ed917c98e24 100644 (file)
--- a/plugins/sudoers/auth/pam.c
+++ b/plugins/sudoers/auth/pam.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c
index 1736f30668cb3466fd26ba430b420bf521384d58..2cc16c370c4f3dea02aacdd2b667d98f121e0750 100644 (file)
--- a/plugins/sudoers/auth/passwd.c
+++ b/plugins/sudoers/auth/passwd.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/rfc1938.c b/plugins/sudoers/auth/rfc1938.c
index f4ed7c0f6de2ff9b11af2cec93d35279ca8d1052..ec94633915d87278b578b892e9b5fee286124b07 100644 (file)
--- a/plugins/sudoers/auth/rfc1938.c
+++ b/plugins/sudoers/auth/rfc1938.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/secureware.c b/plugins/sudoers/auth/secureware.c
index 776b5dd700d025e859129cc4919ca6589a458299..70a9c7b33779f2b1283c910be102c495738c6fb5 100644 (file)
--- a/plugins/sudoers/auth/secureware.c
+++ b/plugins/sudoers/auth/secureware.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/securid5.c b/plugins/sudoers/auth/securid5.c
index 6fe7dcbd079f7e0d01070805ee858957d3a17edf..b2caf4b5e70cdde81a31d78c8628e824b8531994 100644 (file)
--- a/plugins/sudoers/auth/securid5.c
+++ b/plugins/sudoers/auth/securid5.c
@@ -26,7 +26,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/sia.c b/plugins/sudoers/auth/sia.c
index a9f847edaa6023f76fe239574ad3d078254da5f2..96476e019d22459f0f796276d609bd223622e222 100644 (file)
--- a/plugins/sudoers/auth/sia.c
+++ b/plugins/sudoers/auth/sia.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/auth/sudo_auth.c b/plugins/sudoers/auth/sudo_auth.c
index e23954221b0cd0b4ce108c8dca62576a4708b6c4..3cd510b6d45f14dbe22f5f74e943b7e293625618 100644 (file)
--- a/plugins/sudoers/auth/sudo_auth.c
+++ b/plugins/sudoers/auth/sudo_auth.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/boottime.c b/plugins/sudoers/boottime.c
index 2c9c07467a65961b756cdc61931c5ca0f327dcae..6c8f28225751793ab3a74a5a8b5e724ff799d15f 100644 (file)
--- a/plugins/sudoers/boottime.c
+++ b/plugins/sudoers/boottime.c
@@ -16,7 +16,6 @@
 
 #include <config.h>
 
-#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
 

diff --git a/plugins/sudoers/check.c b/plugins/sudoers/check.c
index c0954af3904b2be5bcb95149da8973c318db947b..5f7eb0a6eb4db7fc1aa1adf5cebc19b5a65a7bc3 100644 (file)
--- a/plugins/sudoers/check.c
+++ b/plugins/sudoers/check.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
index 156eff06545e95d611579a569a469f248a6e1483..69ddeebc8c2658beeeaef234b008dc4de74a0ff6 100644 (file)
--- a/plugins/sudoers/defaults.c
+++ b/plugins/sudoers/defaults.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c
index e937a995a3d3ebcf1709fe0d250135707bb63e97..caae19adb94e634c27be5ee4cab20a60dcbaeca4 100644 (file)
--- a/plugins/sudoers/env.c
+++ b/plugins/sudoers/env.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/plugins/sudoers/find_path.c b/plugins/sudoers/find_path.c
index ff1bd096dc6435c18ee67692ebb2d548a69e22c5..a8a85d3f9dd41b49c67ca7a9956059e39d6b471a 100644 (file)
--- a/plugins/sudoers/find_path.c
+++ b/plugins/sudoers/find_path.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/plugins/sudoers/getspwuid.c b/plugins/sudoers/getspwuid.c
index e98db83582b98e71262a7020aab35c15d0f1a622..dd8adcb1f6d0d4cfb5df45d68d5d487b8df4ad2d 100644 (file)
--- a/plugins/sudoers/getspwuid.c
+++ b/plugins/sudoers/getspwuid.c
@@ -23,7 +23,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/goodpath.c b/plugins/sudoers/goodpath.c
index 2a8446b1cd0eaf93acf44774dcfaa570a3672077..f73c1f09d34a5ae14dfb961bf02fc691dbac70bb 100644 (file)
--- a/plugins/sudoers/goodpath.c
+++ b/plugins/sudoers/goodpath.c
@@ -23,7 +23,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c
index a4484ecd371fadd40d09ee772b54a8d781ff72ca..9360db55758420d61a9014442a92c80734f1f565 100644 (file)
--- a/plugins/sudoers/gram.c
+++ b/plugins/sudoers/gram.c
@@ -63,7 +63,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>
@@ -161,7 +160,7 @@ sudoerserror(const char *s)
     parse_error = true;
     debug_return;
 }
-#line 128 "gram.y"
+#line 127 "gram.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -178,7 +177,7 @@ typedef union {
     int tok;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 181 "gram.c"
+#line 180 "gram.c"
 #define COMMAND 257
 #define ALIAS 258
 #define DEFVAR 259
@@ -705,7 +704,7 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 int yystacksize;
-#line 680 "gram.y"
+#line 679 "gram.y"
 static struct defaults *
 new_default(char *var, char *val, int op)
 {
@@ -908,7 +907,7 @@ init_parser(const char *path, bool quiet)
 
     debug_return;
 }
-#line 859 "gram.c"
+#line 858 "gram.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1111,127 +1110,127 @@ yyreduce:
     switch (yyn)
     {
 case 1:
-#line 210 "gram.y"
+#line 209 "gram.y"
 { ; }
 break;
 case 5:
-#line 218 "gram.y"
+#line 217 "gram.y"
 {
                            ;
                        }
 break;
 case 6:
-#line 221 "gram.y"
+#line 220 "gram.y"
 {
                            yyerrok;
                        }
 break;
 case 7:
-#line 224 "gram.y"
+#line 223 "gram.y"
 {
                            add_userspec(yyvsp[-1].member, yyvsp[0].privilege);
                        }
 break;
 case 8:
-#line 227 "gram.y"
+#line 226 "gram.y"
 {
                            ;
                        }
 break;
 case 9:
-#line 230 "gram.y"
+#line 229 "gram.y"
 {
                            ;
                        }
 break;
 case 10:
-#line 233 "gram.y"
+#line 232 "gram.y"
 {
                            ;
                        }
 break;
 case 11:
-#line 236 "gram.y"
+#line 235 "gram.y"
 {
                            ;
                        }
 break;
 case 12:
-#line 239 "gram.y"
+#line 238 "gram.y"
 {
                            add_defaults(DEFAULTS, NULL, yyvsp[0].defaults);
                        }
 break;
 case 13:
-#line 242 "gram.y"
+#line 241 "gram.y"
 {
                            add_defaults(DEFAULTS_USER, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 14:
-#line 245 "gram.y"
+#line 244 "gram.y"
 {
                            add_defaults(DEFAULTS_RUNAS, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 15:
-#line 248 "gram.y"
+#line 247 "gram.y"
 {
                            add_defaults(DEFAULTS_HOST, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 16:
-#line 251 "gram.y"
+#line 250 "gram.y"
 {
                            add_defaults(DEFAULTS_CMND, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 18:
-#line 257 "gram.y"
+#line 256 "gram.y"
 {
                            list_append(yyvsp[-2].defaults, yyvsp[0].defaults);
                            yyval.defaults = yyvsp[-2].defaults;
                        }
 break;
 case 19:
-#line 263 "gram.y"
+#line 262 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, true);
                        }
 break;
 case 20:
-#line 266 "gram.y"
+#line 265 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, false);
                        }
 break;
 case 21:
-#line 269 "gram.y"
+#line 268 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, true);
                        }
 break;
 case 22:
-#line 272 "gram.y"
+#line 271 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '+');
                        }
 break;
 case 23:
-#line 275 "gram.y"
+#line 274 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '-');
                        }
 break;
 case 25:
-#line 281 "gram.y"
+#line 280 "gram.y"
 {
                            list_append(yyvsp[-2].privilege, yyvsp[0].privilege);
                            yyval.privilege = yyvsp[-2].privilege;
                        }
 break;
 case 26:
-#line 287 "gram.y"
+#line 286 "gram.y"
 {
                            struct privilege *p = ecalloc(1, sizeof(*p));
                            list2tq(&p->hostlist, yyvsp[-2].member);
@@ -1242,51 +1241,51 @@ case 26:
                        }
 break;
 case 27:
-#line 297 "gram.y"
+#line 296 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 28:
-#line 301 "gram.y"
+#line 300 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 29:
-#line 307 "gram.y"
+#line 306 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 30:
-#line 310 "gram.y"
+#line 309 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 31:
-#line 313 "gram.y"
+#line 312 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                        }
 break;
 case 32:
-#line 316 "gram.y"
+#line 315 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NTWKADDR);
                        }
 break;
 case 33:
-#line 319 "gram.y"
+#line 318 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                        }
 break;
 case 35:
-#line 325 "gram.y"
+#line 324 "gram.y"
 {
                            list_append(yyvsp[-2].cmndspec, yyvsp[0].cmndspec);
 #ifdef HAVE_SELINUX
@@ -1326,7 +1325,7 @@ case 35:
                        }
 break;
 case 36:
-#line 364 "gram.y"
+#line 363 "gram.y"
 {
                            struct cmndspec *cs = ecalloc(1, sizeof(*cs));
                            if (yyvsp[-4].runas != NULL) {
@@ -1357,127 +1356,127 @@ case 36:
                        }
 break;
 case 37:
-#line 394 "gram.y"
+#line 393 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 38:
-#line 398 "gram.y"
+#line 397 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 39:
-#line 404 "gram.y"
+#line 403 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 40:
-#line 409 "gram.y"
+#line 408 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 41:
-#line 414 "gram.y"
+#line 413 "gram.y"
 {
                            yyval.seinfo.role = NULL;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 42:
-#line 418 "gram.y"
+#line 417 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[0].string;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 43:
-#line 422 "gram.y"
+#line 421 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[0].string;
                            yyval.seinfo.role = NULL;
                        }
 break;
 case 44:
-#line 426 "gram.y"
+#line 425 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[-1].string;
                            yyval.seinfo.type = yyvsp[0].string;
                        }
 break;
 case 45:
-#line 430 "gram.y"
+#line 429 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[-1].string;
                            yyval.seinfo.role = yyvsp[0].string;
                        }
 break;
 case 46:
-#line 436 "gram.y"
+#line 435 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 47:
-#line 440 "gram.y"
+#line 439 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 48:
-#line 445 "gram.y"
+#line 444 "gram.y"
 {
                            yyval.privinfo.privs = NULL;
                            yyval.privinfo.limitprivs = NULL;
                        }
 break;
 case 49:
-#line 449 "gram.y"
+#line 448 "gram.y"
 {
                            yyval.privinfo.privs = yyvsp[0].string;
                            yyval.privinfo.limitprivs = NULL;
                        }
 break;
 case 50:
-#line 453 "gram.y"
+#line 452 "gram.y"
 {
                            yyval.privinfo.privs = NULL;
                            yyval.privinfo.limitprivs = yyvsp[0].string;
                        }
 break;
 case 51:
-#line 457 "gram.y"
+#line 456 "gram.y"
 {
                            yyval.privinfo.privs = yyvsp[-1].string;
                            yyval.privinfo.limitprivs = yyvsp[0].string;
                        }
 break;
 case 52:
-#line 461 "gram.y"
+#line 460 "gram.y"
 {
                            yyval.privinfo.limitprivs = yyvsp[-1].string;
                            yyval.privinfo.privs = yyvsp[0].string;
                        }
 break;
 case 53:
-#line 466 "gram.y"
+#line 465 "gram.y"
 {
                            yyval.runas = NULL;
                        }
 break;
 case 54:
-#line 469 "gram.y"
+#line 468 "gram.y"
 {
                            yyval.runas = yyvsp[-1].runas;
                        }
 break;
 case 55:
-#line 474 "gram.y"
+#line 473 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            yyval.runas->runasusers = new_member(NULL, MYSELF);
@@ -1485,7 +1484,7 @@ case 55:
                        }
 break;
 case 56:
-#line 479 "gram.y"
+#line 478 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            yyval.runas->runasusers = yyvsp[0].member;
@@ -1493,7 +1492,7 @@ case 56:
                        }
 break;
 case 57:
-#line 484 "gram.y"
+#line 483 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            yyval.runas->runasusers = yyvsp[-2].member;
@@ -1501,7 +1500,7 @@ case 57:
                        }
 break;
 case 58:
-#line 489 "gram.y"
+#line 488 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            /* $$->runasusers = NULL; */
@@ -1509,7 +1508,7 @@ case 58:
                        }
 break;
 case 59:
-#line 494 "gram.y"
+#line 493 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            yyval.runas->runasusers = new_member(NULL, MYSELF);
@@ -1517,86 +1516,86 @@ case 59:
                        }
 break;
 case 60:
-#line 501 "gram.y"
+#line 500 "gram.y"
 {
                            yyval.tag.nopasswd = yyval.tag.noexec = yyval.tag.setenv =
                                yyval.tag.log_input = yyval.tag.log_output = UNSPEC;
                        }
 break;
 case 61:
-#line 505 "gram.y"
+#line 504 "gram.y"
 {
                            yyval.tag.nopasswd = true;
                        }
 break;
 case 62:
-#line 508 "gram.y"
+#line 507 "gram.y"
 {
                            yyval.tag.nopasswd = false;
                        }
 break;
 case 63:
-#line 511 "gram.y"
+#line 510 "gram.y"
 {
                            yyval.tag.noexec = true;
                        }
 break;
 case 64:
-#line 514 "gram.y"
+#line 513 "gram.y"
 {
                            yyval.tag.noexec = false;
                        }
 break;
 case 65:
-#line 517 "gram.y"
+#line 516 "gram.y"
 {
                            yyval.tag.setenv = true;
                        }
 break;
 case 66:
-#line 520 "gram.y"
+#line 519 "gram.y"
 {
                            yyval.tag.setenv = false;
                        }
 break;
 case 67:
-#line 523 "gram.y"
+#line 522 "gram.y"
 {
                            yyval.tag.log_input = true;
                        }
 break;
 case 68:
-#line 526 "gram.y"
+#line 525 "gram.y"
 {
                            yyval.tag.log_input = false;
                        }
 break;
 case 69:
-#line 529 "gram.y"
+#line 528 "gram.y"
 {
                            yyval.tag.log_output = true;
                        }
 break;
 case 70:
-#line 532 "gram.y"
+#line 531 "gram.y"
 {
                            yyval.tag.log_output = false;
                        }
 break;
 case 71:
-#line 537 "gram.y"
+#line 536 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 72:
-#line 540 "gram.y"
+#line 539 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 73:
-#line 543 "gram.y"
+#line 542 "gram.y"
 {
                            struct sudo_command *c = ecalloc(1, sizeof(*c));
                            c->cmnd = yyvsp[0].command.cmnd;
@@ -1605,7 +1604,7 @@ case 73:
                        }
 break;
 case 76:
-#line 555 "gram.y"
+#line 554 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, HOSTALIAS, yyvsp[0].member)) != NULL) {
@@ -1615,14 +1614,14 @@ case 76:
                        }
 break;
 case 78:
-#line 565 "gram.y"
+#line 564 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 81:
-#line 575 "gram.y"
+#line 574 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, CMNDALIAS, yyvsp[0].member)) != NULL) {
@@ -1632,14 +1631,14 @@ case 81:
                        }
 break;
 case 83:
-#line 585 "gram.y"
+#line 584 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 86:
-#line 595 "gram.y"
+#line 594 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, RUNASALIAS, yyvsp[0].member)) != NULL) {
@@ -1649,7 +1648,7 @@ case 86:
                        }
 break;
 case 89:
-#line 608 "gram.y"
+#line 607 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, USERALIAS, yyvsp[0].member)) != NULL) {
@@ -1659,96 +1658,96 @@ case 89:
                        }
 break;
 case 91:
-#line 618 "gram.y"
+#line 617 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 92:
-#line 624 "gram.y"
+#line 623 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 93:
-#line 628 "gram.y"
+#line 627 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 94:
-#line 634 "gram.y"
+#line 633 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 95:
-#line 637 "gram.y"
+#line 636 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 96:
-#line 640 "gram.y"
+#line 639 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                        }
 break;
 case 97:
-#line 643 "gram.y"
+#line 642 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, USERGROUP);
                        }
 break;
 case 98:
-#line 646 "gram.y"
+#line 645 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                        }
 break;
 case 100:
-#line 652 "gram.y"
+#line 651 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 101:
-#line 658 "gram.y"
+#line 657 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 102:
-#line 662 "gram.y"
+#line 661 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 103:
-#line 668 "gram.y"
+#line 667 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 104:
-#line 671 "gram.y"
+#line 670 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 105:
-#line 674 "gram.y"
+#line 673 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                        }
 break;
-#line 1699 "gram.c"
+#line 1698 "gram.c"
     }
     yyssp -= yym;
     yystate = *yyssp;

diff --git a/plugins/sudoers/gram.y b/plugins/sudoers/gram.y
index 47e1fc17de7498a12977cd8f444d0069fc6c958f..19fb65770e164fbff0993450e46d32d101a8ad36 100644 (file)
--- a/plugins/sudoers/gram.y
+++ b/plugins/sudoers/gram.y
@@ -25,7 +25,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/group_plugin.c b/plugins/sudoers/group_plugin.c
index 37f36e726bb7e9c58d3f6d7ec798d1ac1f7c93e9..65aaefc709eb0f5f295484393651e7d19c007bd0 100644 (file)
--- a/plugins/sudoers/group_plugin.c
+++ b/plugins/sudoers/group_plugin.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>

diff --git a/plugins/sudoers/interfaces.c b/plugins/sudoers/interfaces.c
index df390cd813bde4e992156580766f2bae178060d5..f6ce5f5430cb64d31700d119b2844008eda220d8 100644 (file)
--- a/plugins/sudoers/interfaces.c
+++ b/plugins/sudoers/interfaces.c
@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c
index 88750312abd027bd88cda5152efeef21341a2001..7036f94daed54c0d744f5655f21cb08545851041 100644 (file)
--- a/plugins/sudoers/iolog.c
+++ b/plugins/sudoers/iolog.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>

diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
index af3c6a37ca6b71ab71ee1033c946250a93011f8d..a4935c7b0de73247c27b330209bfc0d588834eae 100644 (file)
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -20,7 +20,6 @@
 
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
@@ -48,7 +47,6 @@
 #include <grp.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <netdb.h>
 #ifdef HAVE_LBER_H
 # include <lber.h>
 #endif

diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
index fc28380359b1268dcfbe7ad9bfb78cb2a10ddfe9..17237d5719a627e717215616408d20384eadeb50 100644 (file)
--- a/plugins/sudoers/logging.c
+++ b/plugins/sudoers/logging.c
@@ -25,7 +25,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>

diff --git a/plugins/sudoers/match.c b/plugins/sudoers/match.c
index 45c4090c9b309970f96d8734e43fb20f33331912..94367526ce47c9ffdcbf7813a3b281208edde8ac 100644 (file)
--- a/plugins/sudoers/match.c
+++ b/plugins/sudoers/match.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
@@ -56,7 +55,6 @@
 #include <ctype.h>
 #include <pwd.h>
 #include <grp.h>
-#include <netdb.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)

diff --git a/plugins/sudoers/match_addr.c b/plugins/sudoers/match_addr.c
index b6aea7063403dd6e1e47639da08e4fbcd17ba7b1..409ab8dd8160bcc7bd03fc4d17449307ec54ff00 100644 (file)
--- a/plugins/sudoers/match_addr.c
+++ b/plugins/sudoers/match_addr.c
@@ -45,7 +45,6 @@
 #endif /* HAVE_UNISTD_H */
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <netdb.h>
 
 #include "sudoers.h"
 #include "interfaces.h"

diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c
index f5addf0a649e5322d25e7404c0caf301f84c361e..d70eec0a802663485081f6cf207607b5ea37836e 100644 (file)
--- a/plugins/sudoers/parse.c
+++ b/plugins/sudoers/parse.c
@@ -19,7 +19,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
index e0cff9f2df174937dcbfe07e63ac2b2af22e793b..f1af9b30aa49da7cf14f94a6b9f02a36624bb42f 100644 (file)
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <netinet/in.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/plugins/sudoers/prompt.c b/plugins/sudoers/prompt.c
index f5c2fdb7f00e4bd7ec59be2ba30d3a8f05c06162..aadedb7c526fe287396d65a266a1f32b46c6d349 100644 (file)
--- a/plugins/sudoers/prompt.c
+++ b/plugins/sudoers/prompt.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/pwutil.c b/plugins/sudoers/pwutil.c
index 24be29f5df913ebd371246196c2e158b3bce9666..1c4901d41f7ce8b6a8e6ad056b634ea2ffa955c6 100644 (file)
--- a/plugins/sudoers/pwutil.c
+++ b/plugins/sudoers/pwutil.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/pwutil_impl.c b/plugins/sudoers/pwutil_impl.c
index c87b3830c91340ee6bbb1b118e5b99d315eb0252..c929bdc77980972e06ed4b567218028cf8604105 100644 (file)
--- a/plugins/sudoers/pwutil_impl.c
+++ b/plugins/sudoers/pwutil_impl.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/redblack.c b/plugins/sudoers/redblack.c
index 584f2c0aa14b6b07d5499b441ac67df1a06e957a..3cbda4c215fc737682a886f7eba38529eaeb383a 100644 (file)
--- a/plugins/sudoers/redblack.c
+++ b/plugins/sudoers/redblack.c
@@ -43,7 +43,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/plugins/sudoers/regress/parser/check_addr.c b/plugins/sudoers/regress/parser/check_addr.c
index 8bb1cd80649bf7092d6b7c415714839d992ea899..b607a9bfe3c30589635002f8931ef9f14fca616a 100644 (file)
--- a/plugins/sudoers/regress/parser/check_addr.c
+++ b/plugins/sudoers/regress/parser/check_addr.c
@@ -41,7 +41,6 @@
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <netdb.h>
 
 #define SUDO_ERROR_WRAP 0
 

diff --git a/plugins/sudoers/set_perms.c b/plugins/sudoers/set_perms.c
index ef44779fb8096e9c4696ecb2ea7209b91c40dda0..14958fc1a7750db0b855d03b5c88565672635318 100644 (file)
--- a/plugins/sudoers/set_perms.c
+++ b/plugins/sudoers/set_perms.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/plugins/sudoers/sssd.c b/plugins/sudoers/sssd.c
index 95a4776d522dfc3252d859343dfcaa97f155ba3a..26aaab567e8813067b14daeb347891aff879300d 100644 (file)
--- a/plugins/sudoers/sssd.c
+++ b/plugins/sudoers/sssd.c
@@ -21,7 +21,6 @@
 
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/plugins/sudoers/sudo_nss.c b/plugins/sudoers/sudo_nss.c
index 83a3fe912a5d51794a198c8b697a1b62498a5309..e2be3ac43a0a984a8b101555e22a417a1c4cf7f8 100644 (file)
--- a/plugins/sudoers/sudo_nss.c
+++ b/plugins/sudoers/sudo_nss.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 
 #include <stdio.h>

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index f10d4193a4f99dfd528358293ecf79813c7c28b3..4b6f4681ec76df2ca2096121913a5816921c796b 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -28,7 +28,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index fa08b4720991ad670a39a02e68dcccd3a546495f..bcf5746f1447823a88a0861c15c0be84e9b124e1 100644 (file)
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/uio.h>
 #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index f7678de01782fe3bec1d9df8910c96820933493c..8ac9130d1cccc5b5a2b5ebce2ecafc2921d688d5 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -25,7 +25,6 @@
 
 #include <config.h>
 
-#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -59,7 +58,6 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <netdb.h>
 
 #include "tsgetgrpw.h"
 #include "sudoers.h"

diff --git a/plugins/sudoers/timestamp.c b/plugins/sudoers/timestamp.c
index cd2c8c6f16e452f1c9dcf056298ef5ac8de2a08a..93fd94ee2b3da1fbb5230221cca1c35d479efb00 100644 (file)
--- a/plugins/sudoers/timestamp.c
+++ b/plugins/sudoers/timestamp.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #ifdef __linux__

diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index 2ca507513a17c8fca7744906dda37feeec7b53c1..dc60f8ff0698389ed830a3790bf1b50a1de5f82b 100644 (file)
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -1437,7 +1437,6 @@ char *yytext;
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
@@ -1528,7 +1527,7 @@ int (*trace_print)(const char *msg) = sudoers_trace_print;
 
 #define INSTR 5
 
-#line 1531 "lex.sudoers.c"
+#line 1530 "lex.sudoers.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1682,9 +1681,9 @@ YY_DECL
        register char *yy_cp, *yy_bp;
        register int yy_act;
 
-#line 133 "toke.l"
+#line 132 "toke.l"
 
-#line 1687 "lex.sudoers.c"
+#line 1686 "lex.sudoers.c"
 
        if ( yy_init )
                {
@@ -1770,7 +1769,7 @@ do_action:        /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 134 "toke.l"
+#line 133 "toke.l"
 {
                            LEXTRACE(", ");
                            LEXRETURN(',');
@@ -1778,12 +1777,12 @@ YY_RULE_SETUP
        YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 139 "toke.l"
+#line 138 "toke.l"
 BEGIN STARTDEFS;
        YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 141 "toke.l"
+#line 140 "toke.l"
 {
                            BEGIN INDEFS;
                            LEXTRACE("DEFVAR ");
@@ -1795,7 +1794,7 @@ YY_RULE_SETUP
 
 case 4:
 YY_RULE_SETUP
-#line 150 "toke.l"
+#line 149 "toke.l"
 {
                            BEGIN STARTDEFS;
                            LEXTRACE(", ");
@@ -1804,7 +1803,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 156 "toke.l"
+#line 155 "toke.l"
 {
                            LEXTRACE("= ");
                            LEXRETURN('=');
@@ -1812,7 +1811,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 161 "toke.l"
+#line 160 "toke.l"
 {
                            LEXTRACE("+= ");
                            LEXRETURN('+');
@@ -1820,7 +1819,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 166 "toke.l"
+#line 165 "toke.l"
 {
                            LEXTRACE("-= ");
                            LEXRETURN('-');
@@ -1828,7 +1827,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 171 "toke.l"
+#line 170 "toke.l"
 {
                            LEXTRACE("BEGINSTR ");
                            sudoerslval.string = NULL;
@@ -1838,7 +1837,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 178 "toke.l"
+#line 177 "toke.l"
 {
                            LEXTRACE("WORD(2) ");
                            if (!fill(sudoerstext, sudoersleng))
@@ -1850,7 +1849,7 @@ YY_RULE_SETUP
 
 case 10:
 YY_RULE_SETUP
-#line 187 "toke.l"
+#line 186 "toke.l"
 {
                            /* Line continuation char followed by newline. */
                            sudolineno++;
@@ -1859,7 +1858,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 193 "toke.l"
+#line 192 "toke.l"
 {
                            LEXTRACE("ENDSTR ");
                            BEGIN prev_state;
@@ -1894,7 +1893,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 225 "toke.l"
+#line 224 "toke.l"
 {
                            LEXTRACE("BACKSLASH ");
                            if (!append(sudoerstext, sudoersleng))
@@ -1903,7 +1902,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 231 "toke.l"
+#line 230 "toke.l"
 {
                            LEXTRACE("STRBODY ");
                            if (!append(sudoerstext, sudoersleng))
@@ -1914,7 +1913,7 @@ YY_RULE_SETUP
 
 case 14:
 YY_RULE_SETUP
-#line 239 "toke.l"
+#line 238 "toke.l"
 {
                            /* quoted fnmatch glob char, pass verbatim */
                            LEXTRACE("QUOTEDCHAR ");
@@ -1925,7 +1924,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 247 "toke.l"
+#line 246 "toke.l"
 {
                            /* quoted sudoers special char, strip backslash */
                            LEXTRACE("QUOTEDCHAR ");
@@ -1936,7 +1935,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 255 "toke.l"
+#line 254 "toke.l"
 {
                            BEGIN INITIAL;
                            yyless(0);
@@ -1945,7 +1944,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 261 "toke.l"
+#line 260 "toke.l"
 {
                            LEXTRACE("ARG ");
                            if (!fill_args(sudoerstext, sudoersleng, sawspace))
@@ -1956,7 +1955,7 @@ YY_RULE_SETUP
 
 case 18:
 YY_RULE_SETUP
-#line 269 "toke.l"
+#line 268 "toke.l"
 {
                            char *path;
 
@@ -1977,7 +1976,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 287 "toke.l"
+#line 286 "toke.l"
 {
                            char *path;
 
@@ -2001,7 +2000,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 308 "toke.l"
+#line 307 "toke.l"
 {
                            char deftype;
                            int n;
@@ -2044,7 +2043,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 348 "toke.l"
+#line 347 "toke.l"
 {
                            int n;
 
@@ -2073,7 +2072,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 374 "toke.l"
+#line 373 "toke.l"
 {
                                /* cmnd does not require passwd for this user */
                                LEXTRACE("NOPASSWD ");
@@ -2082,7 +2081,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 380 "toke.l"
+#line 379 "toke.l"
 {
                                /* cmnd requires passwd for this user */
                                LEXTRACE("PASSWD ");
@@ -2091,7 +2090,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 386 "toke.l"
+#line 385 "toke.l"
 {
                                LEXTRACE("NOEXEC ");
                                LEXRETURN(NOEXEC);
@@ -2099,7 +2098,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 391 "toke.l"
+#line 390 "toke.l"
 {
                                LEXTRACE("EXEC ");
                                LEXRETURN(EXEC);
@@ -2107,7 +2106,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 396 "toke.l"
+#line 395 "toke.l"
 {
                                LEXTRACE("SETENV ");
                                LEXRETURN(SETENV);
@@ -2115,7 +2114,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 401 "toke.l"
+#line 400 "toke.l"
 {
                                LEXTRACE("NOSETENV ");
                                LEXRETURN(NOSETENV);
@@ -2123,7 +2122,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 406 "toke.l"
+#line 405 "toke.l"
 {
                                LEXTRACE("LOG_OUTPUT ");
                                LEXRETURN(LOG_OUTPUT);
@@ -2131,7 +2130,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 411 "toke.l"
+#line 410 "toke.l"
 {
                                LEXTRACE("NOLOG_OUTPUT ");
                                LEXRETURN(NOLOG_OUTPUT);
@@ -2139,7 +2138,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 416 "toke.l"
+#line 415 "toke.l"
 {
                                LEXTRACE("LOG_INPUT ");
                                LEXRETURN(LOG_INPUT);
@@ -2147,7 +2146,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 421 "toke.l"
+#line 420 "toke.l"
 {
                                LEXTRACE("NOLOG_INPUT ");
                                LEXRETURN(NOLOG_INPUT);
@@ -2155,7 +2154,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 426 "toke.l"
+#line 425 "toke.l"
 {
                            /* empty group or netgroup */
                            LEXTRACE("ERROR ");
@@ -2164,7 +2163,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 432 "toke.l"
+#line 431 "toke.l"
 {
                            /* netgroup */
                            if (!fill(sudoerstext, sudoersleng))
@@ -2175,7 +2174,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 440 "toke.l"
+#line 439 "toke.l"
 {
                            /* group */
                            if (!fill(sudoerstext, sudoersleng))
@@ -2186,7 +2185,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 448 "toke.l"
+#line 447 "toke.l"
 {
                            if (!fill(sudoerstext, sudoersleng))
                                yyterminate();
@@ -2196,7 +2195,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 455 "toke.l"
+#line 454 "toke.l"
 {
                            if (!fill(sudoerstext, sudoersleng))
                                yyterminate();
@@ -2206,7 +2205,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 462 "toke.l"
+#line 461 "toke.l"
 {
                            if (!ipv6_valid(sudoerstext)) {
                                LEXTRACE("ERROR ");
@@ -2220,7 +2219,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 473 "toke.l"
+#line 472 "toke.l"
 {
                            if (!ipv6_valid(sudoerstext)) {
                                LEXTRACE("ERROR ");
@@ -2234,7 +2233,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 484 "toke.l"
+#line 483 "toke.l"
 {
                            LEXTRACE("ALL ");
                            LEXRETURN(ALL);
@@ -2243,7 +2242,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 490 "toke.l"
+#line 489 "toke.l"
 {
 #ifdef HAVE_SELINUX
                            LEXTRACE("ROLE ");
@@ -2255,7 +2254,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 499 "toke.l"
+#line 498 "toke.l"
 {
 #ifdef HAVE_SELINUX
                            LEXTRACE("TYPE ");
@@ -2267,7 +2266,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 507 "toke.l"
+#line 506 "toke.l"
 {
 #ifdef HAVE_PRIV_SET
                            LEXTRACE("PRIVS ");
@@ -2279,7 +2278,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 516 "toke.l"
+#line 515 "toke.l"
 {
 #ifdef HAVE_PRIV_SET
                            LEXTRACE("LIMITPRIVS ");
@@ -2291,7 +2290,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 525 "toke.l"
+#line 524 "toke.l"
 {
                        got_alias:
                            if (!fill(sudoerstext, sudoersleng))
@@ -2302,7 +2301,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 533 "toke.l"
+#line 532 "toke.l"
 {
                            /* no command args allowed for Defaults!/path */
                            if (!fill_cmnd(sudoerstext, sudoersleng))
@@ -2313,7 +2312,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 541 "toke.l"
+#line 540 "toke.l"
 {
                            BEGIN GOTCMND;
                            LEXTRACE("COMMAND ");
@@ -2323,7 +2322,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 548 "toke.l"
+#line 547 "toke.l"
 {
                            /* directories can't have args... */
                            if (sudoerstext[sudoersleng - 1] == '/') {
@@ -2341,7 +2340,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 563 "toke.l"
+#line 562 "toke.l"
 {
                            LEXTRACE("BEGINSTR ");
                            sudoerslval.string = NULL;
@@ -2351,7 +2350,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 570 "toke.l"
+#line 569 "toke.l"
 {
                            /* a word */
                            if (!fill(sudoerstext, sudoersleng))
@@ -2362,7 +2361,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 578 "toke.l"
+#line 577 "toke.l"
 {
                            LEXTRACE("( ");
                            LEXRETURN('(');
@@ -2370,7 +2369,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 583 "toke.l"
+#line 582 "toke.l"
 {
                            LEXTRACE(") ");
                            LEXRETURN(')');
@@ -2378,7 +2377,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 588 "toke.l"
+#line 587 "toke.l"
 {
                            LEXTRACE(", ");
                            LEXRETURN(',');
@@ -2386,7 +2385,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 593 "toke.l"
+#line 592 "toke.l"
 {
                            LEXTRACE("= ");
                            LEXRETURN('=');
@@ -2394,7 +2393,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 598 "toke.l"
+#line 597 "toke.l"
 {
                            LEXTRACE(": ");
                            LEXRETURN(':');
@@ -2402,7 +2401,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 603 "toke.l"
+#line 602 "toke.l"
 {
                            if (sudoersleng & 1) {
                                LEXTRACE("!");
@@ -2412,7 +2411,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 610 "toke.l"
+#line 609 "toke.l"
 {
                            if (YY_START == INSTR) {
                                LEXTRACE("ERROR ");
@@ -2427,14 +2426,14 @@ YY_RULE_SETUP
        YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 622 "toke.l"
+#line 621 "toke.l"
 {                      /* throw away space/tabs */
                            sawspace = true;    /* but remember for fill_args */
                        }
        YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 626 "toke.l"
+#line 625 "toke.l"
 {
                            sawspace = true;    /* remember for fill_args */
                            sudolineno++;
@@ -2443,7 +2442,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 632 "toke.l"
+#line 631 "toke.l"
 {
                            BEGIN INITIAL;
                            sudolineno++;
@@ -2454,7 +2453,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 640 "toke.l"
+#line 639 "toke.l"
 {
                            LEXTRACE("ERROR ");
                            LEXRETURN(ERROR);
@@ -2466,7 +2465,7 @@ case YY_STATE_EOF(GOTCMND):
 case YY_STATE_EOF(STARTDEFS):
 case YY_STATE_EOF(INDEFS):
 case YY_STATE_EOF(INSTR):
-#line 645 "toke.l"
+#line 644 "toke.l"
 {
                            if (YY_START != INITIAL) {
                                BEGIN INITIAL;
@@ -2479,10 +2478,10 @@ case YY_STATE_EOF(INSTR):
        YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 655 "toke.l"
+#line 654 "toke.l"
 ECHO;
        YY_BREAK
-#line 2485 "lex.sudoers.c"
+#line 2484 "lex.sudoers.c"
 
        case YY_END_OF_BUFFER:
                {
@@ -3373,7 +3372,7 @@ int main()
        return 0;
        }
 #endif
-#line 655 "toke.l"
+#line 654 "toke.l"
 
 struct path_list {
     char *path;

diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
index 893dee41bf11df2c3eac56698a1c10ddd5162201..6a9bae471230e72a015e0d1f68f12a580abe4f55 100644 (file)
--- a/plugins/sudoers/toke.l
+++ b/plugins/sudoers/toke.l
@@ -26,7 +26,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/plugins/sudoers/toke_util.c b/plugins/sudoers/toke_util.c
index c25f556d5152367b9a1f080241c1efcb11deb3b6..e717e946f533d1fc19d0418713227eb711675088 100644 (file)
--- a/plugins/sudoers/toke_util.c
+++ b/plugins/sudoers/toke_util.c
@@ -25,7 +25,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/tsgetgrpw.c b/plugins/sudoers/tsgetgrpw.c
index 4fd93360292e4daf02496cebbf4b204c5176ddc8..5b44aceb91dacbf1ac601b5ee7a284d6e342d1dd 100644 (file)
--- a/plugins/sudoers/tsgetgrpw.c
+++ b/plugins/sudoers/tsgetgrpw.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index f9f92bc3ad30e86161db01b703e7f2caafc39673..34abec88f16619fa7a579f9a3b83b5651bc03b3e 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -32,7 +32,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -68,7 +67,6 @@
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <netdb.h>
 #if TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/plugins/system_group/system_group.c b/plugins/system_group/system_group.c
index b015d39f1e8070251fc1c4328d18294216220542..d6567dbd3956d3ca20e9557cb5af4a39c38d45b1 100644 (file)
--- a/plugins/system_group/system_group.c
+++ b/plugins/system_group/system_group.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 
 #include <stdio.h>

diff --git a/src/conversation.c b/src/conversation.c
index aea675d10528fefffa1327019235b9300315f222..5122609457cf11d8ea462818d247a51624250f34 100644 (file)
--- a/src/conversation.c
+++ b/src/conversation.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/src/exec.c b/src/exec.c
index 5c149c8b188f5deb4d28fb05464cbb62e5b577cd..b49b836e3b3c3154a27690b5adc712333f8bb467 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>
 #endif

diff --git a/src/exec_common.c b/src/exec_common.c
index 426fba0c0224da3877dfbbc1e869c30972d858d4..045c702de321aa3f3cf263f7875290590c058357 100644 (file)
--- a/src/exec_common.c
+++ b/src/exec_common.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/src/exec_pty.c b/src/exec_pty.c
index 98fb557788cccf206c168007fac96d7345de1a02..403928360de480062362c59f5acf357e4fd0d731 100644 (file)
--- a/src/exec_pty.c
+++ b/src/exec_pty.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>
 #endif

diff --git a/src/get_pty.c b/src/get_pty.c
index 21449cb919485b308c6fd66c187727e0ea40ea6b..f6a1fab164defc37561031dabc82f32143873213 100644 (file)
--- a/src/get_pty.c
+++ b/src/get_pty.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #ifdef HAVE_SYS_STROPTS_H

diff --git a/src/load_plugins.c b/src/load_plugins.c
index 893bd2f7025ca59181726945d243dad2749e037f..2efe1e63da353e14dd150f392957834bb0cfd1a6 100644 (file)
--- a/src/load_plugins.c
+++ b/src/load_plugins.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/src/net_ifs.c b/src/net_ifs.c
index fa8b6760415b327a42018dfb4644e682e8bda9c9..82fc3629f6ed357b0ff3439ce551669f8fa5dcf8 100644 (file)
--- a/src/net_ifs.c
+++ b/src/net_ifs.c
@@ -32,7 +32,6 @@ struct rtentry;
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/param.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #if defined(HAVE_SYS_SOCKIO_H) && !defined(SIOCGIFCONF)

diff --git a/src/parse_args.c b/src/parse_args.c
index 652850983d7ae23b23650b0db432a26acd78582e..35e87a814916ad70c53c8e02ba9189ade07cbf00 100644 (file)
--- a/src/parse_args.c
+++ b/src/parse_args.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 
 #include <stdio.h>
 #ifdef STDC_HEADERS

diff --git a/src/sudo.c b/src/sudo.c
index 1e28e870ecf362888353e9c3ed2007c516cdd85b..d90ea18544b62ca8d87bde467479bbd8a39052eb 100644 (file)
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/socket.h>

diff --git a/src/sudo_edit.c b/src/sudo_edit.c
index f7df6e81234eca4ebd066b1941ff3358897b041e..0c9d1b12badc654c4ea6f1e6d40e1b6003390b97 100644 (file)
--- a/src/sudo_edit.c
+++ b/src/sudo_edit.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/wait.h>

diff --git a/src/tgetpass.c b/src/tgetpass.c
index b23db4cc5fe87c9b3b9a1e684e9cb1fb47c668f4..489c66b783a83f92ea7ebc0d83d204be19f2eb8f 100644 (file)
--- a/src/tgetpass.c
+++ b/src/tgetpass.c
@@ -26,7 +26,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>

diff --git a/src/ttyname.c b/src/ttyname.c
index 821dc2366525054372a71a0c992e17107fc2d7f5..9176cbb7695f537bd587672fac3cb8029287fd41 100644 (file)
--- a/src/ttyname.c
+++ b/src/ttyname.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #if defined(MAJOR_IN_MKDEV)
 # include <sys/mkdev.h>
@@ -71,8 +70,10 @@
 # endif
 #endif
 #if defined(HAVE_STRUCT_KINFO_PROC_P_TDEV) || defined (HAVE_STRUCT_KINFO_PROC_KP_EPROC_E_TDEV) || defined(HAVE_STRUCT_KINFO_PROC2_P_TDEV)
+# include <sys/param.h>
 # include <sys/sysctl.h>
 #elif defined(HAVE_STRUCT_KINFO_PROC_KI_TDEV)
+# include <sys/param.h>
 # include <sys/sysctl.h>
 # include <sys/user.h>
 #endif

diff --git a/src/utmp.c b/src/utmp.c
index 97a1ea659b63413ac748f546dbb4a73759e865a1..613e78c2fa75d87570fb32e3ebe5eab0f3b3adbe 100644 (file)
--- a/src/utmp.c
+++ b/src/utmp.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <stdio.h>