There's no need to conditionalize the #include <unistd.h>, we require

a POSIX system.

diff --git a/lib/util/event.c b/lib/util/event.c
index 0f209eb8d6470c63416e8a95f3aed59ae85dbec3..703f8f243157f7449133346c676dba2bcbbd9a35 100644 (file)
--- a/lib/util/event.c
+++ b/lib/util/event.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudo_compat.h"

diff --git a/lib/util/event_poll.c b/lib/util/event_poll.c
index e2454c003ff773822c28e3cd6b5f74ca90ebc5cd..e238c381395139d3fec9cf78f0a0d53874fce340 100644 (file)
--- a/lib/util/event_poll.c
+++ b/lib/util/event_poll.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <poll.h>
 

diff --git a/lib/util/event_select.c b/lib/util/event_select.c
index a63d9c06349589b81c0e0fc33b5366aac4f928c1..75e83077549bda5eab34778ffec032b8e9e59fb3 100644 (file)
--- a/lib/util/event_select.c
+++ b/lib/util/event_select.c
@@ -37,9 +37,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudo_compat.h"

diff --git a/lib/util/getcwd.c b/lib/util/getcwd.c
index 3d9d8a17c69910082aae0ca3eef47b4df17103a4..e3eaeecc5c8fee83ca301418994e7104c91d3577 100644 (file)
--- a/lib/util/getcwd.c
+++ b/lib/util/getcwd.c
@@ -43,9 +43,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)

diff --git a/lib/util/gettime.c b/lib/util/gettime.c
index 8eae8047d32a32325fec4163bf72c9d25ffb7378..22191d0dcd691e9e8afadf53d5c5f2fdb3b3072f 100644 (file)
--- a/lib/util/gettime.c
+++ b/lib/util/gettime.c
@@ -20,9 +20,7 @@
 #include <sys/time.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/lib/util/glob.c b/lib/util/glob.c
index 9c177e790e24a636d47eaee7dd8283d75ac44cae..889d2dedca1d2253746757295419057d16ca2780 100644 (file)
--- a/lib/util/glob.c
+++ b/lib/util/glob.c
@@ -65,9 +65,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)

diff --git a/lib/util/lbuf.c b/lib/util/lbuf.c
index d3411f1632c0a96856b08880cd4ebb3b6b1e32bc..0e56ba36f1200686c988189c5450d0a88499f9f6 100644 (file)
--- a/lib/util/lbuf.c
+++ b/lib/util/lbuf.c
@@ -27,9 +27,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 
 #include "sudo_compat.h"

diff --git a/lib/util/locking.c b/lib/util/locking.c
index 879e2b4f256973aec1882a6fa2ed71aea3e88445..ca53cb6ac48104bea0bdb291bc87364ff8676ac9 100644 (file)
--- a/lib/util/locking.c
+++ b/lib/util/locking.c
@@ -33,9 +33,7 @@
 # include <strings.h>
 #endif /* HAVE_STRING_H */
 #include <ctype.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <fcntl.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>

diff --git a/lib/util/mktemp.c b/lib/util/mktemp.c
index 2a64cc9ca2df43de1154169d46622c349f0d6730..2a71e40021dc3899ed2f807f6bee96eea347e728 100644 (file)
--- a/lib/util/mktemp.c
+++ b/lib/util/mktemp.c
@@ -37,9 +37,7 @@
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
 #include <ctype.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/lib/util/parseln.c b/lib/util/parseln.c
index 71486e5218fc9c5055a6d7a4a5c647ea9a5f98e5..1b26a3dda23ab29fa76aa705ca5a49184d5e8087 100644 (file)
--- a/lib/util/parseln.c
+++ b/lib/util/parseln.c
@@ -26,9 +26,7 @@
 # include <strings.h>
 #endif /* HAVE_STRING_H */
 #include <ctype.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <fcntl.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>

diff --git a/lib/util/secure_path.c b/lib/util/secure_path.c
index ef0a0b64322dd1fd54957d135cecc6c17e971fca..aba7d30e8ace180594f1f44b06eec1b9cc99442c 100644 (file)
--- a/lib/util/secure_path.c
+++ b/lib/util/secure_path.c
@@ -25,9 +25,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudo_compat.h"

diff --git a/lib/util/setgroups.c b/lib/util/setgroups.c
index 80204a503fdc3acff8d7f1eb11cbcea8a09d6030..f6978427fb41849b1ec769ee4389fdc7855a32ee 100644 (file)
--- a/lib/util/setgroups.c
+++ b/lib/util/setgroups.c
@@ -21,9 +21,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <grp.h>
 #include <limits.h>

diff --git a/lib/util/sudo_conf.c b/lib/util/sudo_conf.c
index efee7e70ecf13cb764edc674a8b75570d097459a..edb6724ffdccedb253ecc30ddc3a75cf0070959d 100644 (file)
--- a/lib/util/sudo_conf.c
+++ b/lib/util/sudo_conf.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>

diff --git a/lib/util/sudo_debug.c b/lib/util/sudo_debug.c
index 9c884e4162001971eec8ef91b037c0cac7a8e857..28907085fcba39510c7ce87e019349c6205e0568 100644 (file)
--- a/lib/util/sudo_debug.c
+++ b/lib/util/sudo_debug.c
@@ -27,9 +27,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/lib/util/ttysize.c b/lib/util/ttysize.c
index 7a5416314fee96f6d3741dd8a49ff22afd588a5e..816d251df9e9b39c26d92827d4cbece15e3dac34 100644 (file)
--- a/lib/util/ttysize.c
+++ b/lib/util/ttysize.c
@@ -22,9 +22,7 @@
 #include <sys/ioctl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <termios.h>
 #include <limits.h>
 

diff --git a/plugins/group_file/group_file.c b/plugins/group_file/group_file.c
index 53bb08b25f15d74ac69f2e9a9e003f30e3d63eaf..788eb8d0c683c3383b587987293854ac0c25034a 100644 (file)
--- a/plugins/group_file/group_file.c
+++ b/plugins/group_file/group_file.c
@@ -32,9 +32,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/plugins/sample/sample_plugin.c b/plugins/sample/sample_plugin.c
index 44ff6aeef07c7511ba9f92c0bbe448a49455656b..2451c97c698621450a9fb21af98f14d4e1718672 100644 (file)
--- a/plugins/sample/sample_plugin.c
+++ b/plugins/sample/sample_plugin.c
@@ -33,9 +33,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <limits.h>

diff --git a/plugins/sudoers/alias.c b/plugins/sudoers/alias.c
index 9ea70c5f3f4893dbd97e41997ad1368f1856902b..4676a16bcfb0698427ba6695c7244ae14b5bde0b 100644 (file)
--- a/plugins/sudoers/alias.c
+++ b/plugins/sudoers/alias.c
@@ -28,9 +28,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRING_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudoers.h"

diff --git a/plugins/sudoers/auth/afs.c b/plugins/sudoers/auth/afs.c
index c10913bfb8f51b1afe897434c967c1fbf0d13e18..5693cb18b5ff6b534f60eb8bb00d0daf0b11f560 100644 (file)
--- a/plugins/sudoers/auth/afs.c
+++ b/plugins/sudoers/auth/afs.c
@@ -32,9 +32,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRING_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 
 #include <afs/stds.h>

diff --git a/plugins/sudoers/auth/aix_auth.c b/plugins/sudoers/auth/aix_auth.c
index 4b26c67e47677e810e3e15f6f8eecdaef66f639c..66a0b23e1230f165b81cf242db368dba7b8f9fe0 100644 (file)
--- a/plugins/sudoers/auth/aix_auth.c
+++ b/plugins/sudoers/auth/aix_auth.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRING_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <pwd.h>
 #include <usersec.h>

diff --git a/plugins/sudoers/auth/bsdauth.c b/plugins/sudoers/auth/bsdauth.c
index 1c40e9348c57f7804314ced6aa55cc10a0b1636d..e01b6944a1e08ed1ef8f18225f70cc98b0d75741 100644 (file)
--- a/plugins/sudoers/auth/bsdauth.c
+++ b/plugins/sudoers/auth/bsdauth.c
@@ -32,9 +32,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRING_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <pwd.h>
 #include <signal.h>

diff --git a/plugins/sudoers/auth/dce.c b/plugins/sudoers/auth/dce.c
index eabc7dd008ef263cb05f991f21a6716adc096f7d..e5966152e5c24fbfd93446c74f733876d28b0d3c 100644 (file)
--- a/plugins/sudoers/auth/dce.c
+++ b/plugins/sudoers/auth/dce.c
@@ -46,9 +46,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRING_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 
 #include <dce/rpc.h>

diff --git a/plugins/sudoers/auth/fwtk.c b/plugins/sudoers/auth/fwtk.c
index 43aa279ca9cebf4332482b3e9c8684799daa5ff2..73094d6c2b3022a13cff83f14e7f3d75c5d5f421 100644 (file)
--- a/plugins/sudoers/auth/fwtk.c
+++ b/plugins/sudoers/auth/fwtk.c
@@ -32,9 +32,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRING_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 
 #include <auth.h>

diff --git a/plugins/sudoers/auth/kerb5.c b/plugins/sudoers/auth/kerb5.c
index c8550a27a305fa8db152ab09448bc15c47938100..8c7aff6f854c484baa1548949f17f00038b07929 100644 (file)
--- a/plugins/sudoers/auth/kerb5.c
+++ b/plugins/sudoers/auth/kerb5.c
@@ -35,9 +35,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRING_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 #include <krb5.h>
 #ifdef HAVE_HEIMDAL

diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c
index 9dee74ea9666f8211b2adb5e1ae83aea017fcece..571dbf8243cec9a16f5d0a8b3269ef2087ab8450 100644 (file)
--- a/plugins/sudoers/auth/pam.c
+++ b/plugins/sudoers/auth/pam.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 #include <errno.h>
 

diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c
index 3e7dee699f9ea8b4f5bb11c3a8962e4cde105b69..9173ff35a406d6c77b40fa06b121874a5431e1e8 100644 (file)
--- a/plugins/sudoers/auth/passwd.c
+++ b/plugins/sudoers/auth/passwd.c
@@ -29,9 +29,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 
 #include "sudoers.h"

diff --git a/plugins/sudoers/auth/rfc1938.c b/plugins/sudoers/auth/rfc1938.c
index 8dc7dd92970f7cd5a38a4ece2c65cfbc20738fe7..cf2e37eda55c94acb16fade646703fc9c139ef55 100644 (file)
--- a/plugins/sudoers/auth/rfc1938.c
+++ b/plugins/sudoers/auth/rfc1938.c
@@ -32,9 +32,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 
 #if defined(HAVE_SKEY)

diff --git a/plugins/sudoers/auth/secureware.c b/plugins/sudoers/auth/secureware.c
index c6f326eb23b119d77bac465b01ed2dd0670516ee..a44a3cb0d435b4316b5c2eb35d12eb107ed5e858 100644 (file)
--- a/plugins/sudoers/auth/secureware.c
+++ b/plugins/sudoers/auth/secureware.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 #ifdef __hpux
 #  undef MAXINT

diff --git a/plugins/sudoers/auth/securid5.c b/plugins/sudoers/auth/securid5.c
index 1ce73c02a0186b5667ca947fc77ecd4b5be38fcc..7274de0feea9c30c5032cf583f5c052d61d437d9 100644 (file)
--- a/plugins/sudoers/auth/securid5.c
+++ b/plugins/sudoers/auth/securid5.c
@@ -36,9 +36,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 
 /* Needed for SecurID v5.0 Authentication on UNIX */

diff --git a/plugins/sudoers/auth/sia.c b/plugins/sudoers/auth/sia.c
index 5d400524a86fcc92a4b7e97e9cd75ce071302cad..b6c757f4abbb2f01f1506c5ebe30f477dfbd57e8 100644 (file)
--- a/plugins/sudoers/auth/sia.c
+++ b/plugins/sudoers/auth/sia.c
@@ -34,9 +34,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 #include <signal.h>
 #include <siad.h>

diff --git a/plugins/sudoers/auth/sudo_auth.c b/plugins/sudoers/auth/sudo_auth.c
index 61378a166ea2ee20620c6477c3aefe84e363bc42..83bd0858863cfd4511357ea4b0a761875394d033 100644 (file)
--- a/plugins/sudoers/auth/sudo_auth.c
+++ b/plugins/sudoers/auth/sudo_auth.c
@@ -29,9 +29,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 #include <time.h>
 #include <signal.h>

diff --git a/plugins/sudoers/check.c b/plugins/sudoers/check.c
index 24f20316c22cba16f905854605b50de1f66717f1..f29b103e3c67758ac9cd65350127e98a0c6f4b5e 100644 (file)
--- a/plugins/sudoers/check.c
+++ b/plugins/sudoers/check.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
index 5e6b29105d954f73001d429ea8a14d3fbbbe3138..58960c09d9d35c1af80dae41ad33c07bdc015e33 100644 (file)
--- a/plugins/sudoers/defaults.c
+++ b/plugins/sudoers/defaults.c
@@ -30,9 +30,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-# ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <pwd.h>
 #include <ctype.h>
 

diff --git a/plugins/sudoers/editor.c b/plugins/sudoers/editor.c
index 8ffc37af3e0cfd75661b9fde4e95bc3816b6c2e1..6ef426186a8f0a8aedd3b20a6cbd1c4f0fb63a85 100644 (file)
--- a/plugins/sudoers/editor.c
+++ b/plugins/sudoers/editor.c
@@ -26,9 +26,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudoers.h"

diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c
index 1e7f94c162d2a65a01e2cde6c789bee9834e470f..848a7e6bf3f2846f0965337dafe7a49e861980f3 100644 (file)
--- a/plugins/sudoers/env.c
+++ b/plugins/sudoers/env.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)

diff --git a/plugins/sudoers/find_path.c b/plugins/sudoers/find_path.c
index 6c9f47aa3f0441039ad2f9223f800a0008a2ccef..1742ecea55d2433fa442e98028b0004264f0368a 100644 (file)
--- a/plugins/sudoers/find_path.c
+++ b/plugins/sudoers/find_path.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudoers.h"

diff --git a/plugins/sudoers/getspwuid.c b/plugins/sudoers/getspwuid.c
index 2615db5161533bc9eae5e118656b0a68e1f5c43e..38cbc4f6241d0bfe6bb118c1b189235d18b18178 100644 (file)
--- a/plugins/sudoers/getspwuid.c
+++ b/plugins/sudoers/getspwuid.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 #include <grp.h>
 #ifdef HAVE_GETSPNAM

diff --git a/plugins/sudoers/goodpath.c b/plugins/sudoers/goodpath.c
index 5a68391667881137b83b3c73e2776ec577863be3..822a03bfc30c5c7257e5bb94afcfb555e736ac71 100644 (file)
--- a/plugins/sudoers/goodpath.c
+++ b/plugins/sudoers/goodpath.c
@@ -30,9 +30,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudoers.h"

diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c
index fbacdad7bebeaa7370c80057c26feea288e6dbea..632fbea4f6a7a4d6b31854ce4cdfabe0e2a45e4f 100644 (file)
--- a/plugins/sudoers/gram.c
+++ b/plugins/sudoers/gram.c
@@ -72,9 +72,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)
@@ -108,7 +106,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 75 "gram.y"
+#line 73 "gram.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -126,7 +124,7 @@ typedef union {
     int tok;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 129 "gram.c"
+#line 127 "gram.c"
 #define COMMAND 257
 #define ALIAS 258
 #define DEFVAR 259
@@ -703,7 +701,7 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 unsigned int yystacksize;
-#line 852 "gram.y"
+#line 850 "gram.y"
 void
 sudoerserror(const char *s)
 {
@@ -985,7 +983,7 @@ init_parser(const char *path, bool quiet)
 
     debug_return_bool(rval);
 }
-#line 936 "gram.c"
+#line 934 "gram.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1194,23 +1192,23 @@ yyreduce:
     switch (yyn)
     {
 case 1:
-#line 167 "gram.y"
+#line 165 "gram.y"
 { ; }
 break;
 case 5:
-#line 175 "gram.y"
+#line 173 "gram.y"
 {
                            ;
                        }
 break;
 case 6:
-#line 178 "gram.y"
+#line 176 "gram.y"
 {
                            yyerrok;
                        }
 break;
 case 7:
-#line 181 "gram.y"
+#line 179 "gram.y"
 {
                            if (!add_userspec(yyvsp[-1].member, yyvsp[0].privilege)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1219,31 +1217,31 @@ case 7:
                        }
 break;
 case 8:
-#line 187 "gram.y"
+#line 185 "gram.y"
 {
                            ;
                        }
 break;
 case 9:
-#line 190 "gram.y"
+#line 188 "gram.y"
 {
                            ;
                        }
 break;
 case 10:
-#line 193 "gram.y"
+#line 191 "gram.y"
 {
                            ;
                        }
 break;
 case 11:
-#line 196 "gram.y"
+#line 194 "gram.y"
 {
                            ;
                        }
 break;
 case 12:
-#line 199 "gram.y"
+#line 197 "gram.y"
 {
                            if (!add_defaults(DEFAULTS, NULL, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1252,7 +1250,7 @@ case 12:
                        }
 break;
 case 13:
-#line 205 "gram.y"
+#line 203 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_USER, yyvsp[-1].member, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1261,7 +1259,7 @@ case 13:
                        }
 break;
 case 14:
-#line 211 "gram.y"
+#line 209 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_RUNAS, yyvsp[-1].member, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1270,7 +1268,7 @@ case 14:
                        }
 break;
 case 15:
-#line 217 "gram.y"
+#line 215 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_HOST, yyvsp[-1].member, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1279,7 +1277,7 @@ case 15:
                        }
 break;
 case 16:
-#line 223 "gram.y"
+#line 221 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_CMND, yyvsp[-1].member, yyvsp[0].defaults)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1288,14 +1286,14 @@ case 16:
                        }
 break;
 case 18:
-#line 232 "gram.y"
+#line 230 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].defaults, yyvsp[0].defaults, entries);
                            yyval.defaults = yyvsp[-2].defaults;
                        }
 break;
 case 19:
-#line 238 "gram.y"
+#line 236 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, true);
                            if (yyval.defaults == NULL) {
@@ -1305,7 +1303,7 @@ case 19:
                        }
 break;
 case 20:
-#line 245 "gram.y"
+#line 243 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, false);
                            if (yyval.defaults == NULL) {
@@ -1315,7 +1313,7 @@ case 20:
                        }
 break;
 case 21:
-#line 252 "gram.y"
+#line 250 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, true);
                            if (yyval.defaults == NULL) {
@@ -1325,7 +1323,7 @@ case 21:
                        }
 break;
 case 22:
-#line 259 "gram.y"
+#line 257 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '+');
                            if (yyval.defaults == NULL) {
@@ -1335,7 +1333,7 @@ case 22:
                        }
 break;
 case 23:
-#line 266 "gram.y"
+#line 264 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '-');
                            if (yyval.defaults == NULL) {
@@ -1345,14 +1343,14 @@ case 23:
                        }
 break;
 case 25:
-#line 276 "gram.y"
+#line 274 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].privilege, yyvsp[0].privilege, entries);
                            yyval.privilege = yyvsp[-2].privilege;
                        }
 break;
 case 26:
-#line 282 "gram.y"
+#line 280 "gram.y"
 {
                            struct privilege *p = calloc(1, sizeof(*p));
                            if (p == NULL) {
@@ -1366,21 +1364,21 @@ case 26:
                        }
 break;
 case 27:
-#line 295 "gram.y"
+#line 293 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 28:
-#line 299 "gram.y"
+#line 297 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 29:
-#line 305 "gram.y"
+#line 303 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -1390,7 +1388,7 @@ case 29:
                        }
 break;
 case 30:
-#line 312 "gram.y"
+#line 310 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -1400,7 +1398,7 @@ case 30:
                        }
 break;
 case 31:
-#line 319 "gram.y"
+#line 317 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                            if (yyval.member == NULL) {
@@ -1410,7 +1408,7 @@ case 31:
                        }
 break;
 case 32:
-#line 326 "gram.y"
+#line 324 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NTWKADDR);
                            if (yyval.member == NULL) {
@@ -1420,7 +1418,7 @@ case 32:
                        }
 break;
 case 33:
-#line 333 "gram.y"
+#line 331 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                            if (yyval.member == NULL) {
@@ -1430,7 +1428,7 @@ case 33:
                        }
 break;
 case 35:
-#line 343 "gram.y"
+#line 341 "gram.y"
 {
                            struct cmndspec *prev;
                            prev = HLTQ_LAST(yyvsp[-2].cmndspec, cmndspec, entries);
@@ -1474,7 +1472,7 @@ case 35:
                        }
 break;
 case 36:
-#line 386 "gram.y"
+#line 384 "gram.y"
 {
                            struct cmndspec *cs = calloc(1, sizeof(*cs));
                            if (cs == NULL) {
@@ -1523,7 +1521,7 @@ case 36:
                        }
 break;
 case 37:
-#line 434 "gram.y"
+#line 432 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA224, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1533,7 +1531,7 @@ case 37:
                        }
 break;
 case 38:
-#line 441 "gram.y"
+#line 439 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA256, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1543,7 +1541,7 @@ case 38:
                        }
 break;
 case 39:
-#line 448 "gram.y"
+#line 446 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA384, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1553,7 +1551,7 @@ case 39:
                        }
 break;
 case 40:
-#line 455 "gram.y"
+#line 453 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA512, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1563,13 +1561,13 @@ case 40:
                        }
 break;
 case 41:
-#line 464 "gram.y"
+#line 462 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                        }
 break;
 case 42:
-#line 467 "gram.y"
+#line 465 "gram.y"
 {
                            if (yyvsp[0].member->type != COMMAND) {
                                sudoerserror(N_("a digest requires a path name"));
@@ -1581,127 +1579,127 @@ case 42:
                        }
 break;
 case 43:
-#line 478 "gram.y"
+#line 476 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 44:
-#line 482 "gram.y"
+#line 480 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 45:
-#line 488 "gram.y"
+#line 486 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 46:
-#line 493 "gram.y"
+#line 491 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 47:
-#line 498 "gram.y"
+#line 496 "gram.y"
 {
                            yyval.seinfo.role = NULL;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 48:
-#line 502 "gram.y"
+#line 500 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[0].string;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 49:
-#line 506 "gram.y"
+#line 504 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[0].string;
                            yyval.seinfo.role = NULL;
                        }
 break;
 case 50:
-#line 510 "gram.y"
+#line 508 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[-1].string;
                            yyval.seinfo.type = yyvsp[0].string;
                        }
 break;
 case 51:
-#line 514 "gram.y"
+#line 512 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[-1].string;
                            yyval.seinfo.role = yyvsp[0].string;
                        }
 break;
 case 52:
-#line 520 "gram.y"
+#line 518 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 53:
-#line 524 "gram.y"
+#line 522 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 54:
-#line 529 "gram.y"
+#line 527 "gram.y"
 {
                            yyval.privinfo.privs = NULL;
                            yyval.privinfo.limitprivs = NULL;
                        }
 break;
 case 55:
-#line 533 "gram.y"
+#line 531 "gram.y"
 {
                            yyval.privinfo.privs = yyvsp[0].string;
                            yyval.privinfo.limitprivs = NULL;
                        }
 break;
 case 56:
-#line 537 "gram.y"
+#line 535 "gram.y"
 {
                            yyval.privinfo.privs = NULL;
                            yyval.privinfo.limitprivs = yyvsp[0].string;
                        }
 break;
 case 57:
-#line 541 "gram.y"
+#line 539 "gram.y"
 {
                            yyval.privinfo.privs = yyvsp[-1].string;
                            yyval.privinfo.limitprivs = yyvsp[0].string;
                        }
 break;
 case 58:
-#line 545 "gram.y"
+#line 543 "gram.y"
 {
                            yyval.privinfo.limitprivs = yyvsp[-1].string;
                            yyval.privinfo.privs = yyvsp[0].string;
                        }
 break;
 case 59:
-#line 551 "gram.y"
+#line 549 "gram.y"
 {
                            yyval.runas = NULL;
                        }
 break;
 case 60:
-#line 554 "gram.y"
+#line 552 "gram.y"
 {
                            yyval.runas = yyvsp[-1].runas;
                        }
 break;
 case 61:
-#line 559 "gram.y"
+#line 557 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas != NULL) {
@@ -1719,7 +1717,7 @@ case 61:
                        }
 break;
 case 62:
-#line 574 "gram.y"
+#line 572 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas == NULL) {
@@ -1731,7 +1729,7 @@ case 62:
                        }
 break;
 case 63:
-#line 583 "gram.y"
+#line 581 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas == NULL) {
@@ -1743,7 +1741,7 @@ case 63:
                        }
 break;
 case 64:
-#line 592 "gram.y"
+#line 590 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas == NULL) {
@@ -1755,7 +1753,7 @@ case 64:
                        }
 break;
 case 65:
-#line 601 "gram.y"
+#line 599 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas != NULL) {
@@ -1773,86 +1771,86 @@ case 65:
                        }
 break;
 case 66:
-#line 618 "gram.y"
+#line 616 "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 622 "gram.y"
+#line 620 "gram.y"
 {
                            yyval.tag.nopasswd = true;
                        }
 break;
 case 68:
-#line 625 "gram.y"
+#line 623 "gram.y"
 {
                            yyval.tag.nopasswd = false;
                        }
 break;
 case 69:
-#line 628 "gram.y"
+#line 626 "gram.y"
 {
                            yyval.tag.noexec = true;
                        }
 break;
 case 70:
-#line 631 "gram.y"
+#line 629 "gram.y"
 {
                            yyval.tag.noexec = false;
                        }
 break;
 case 71:
-#line 634 "gram.y"
+#line 632 "gram.y"
 {
                            yyval.tag.setenv = true;
                        }
 break;
 case 72:
-#line 637 "gram.y"
+#line 635 "gram.y"
 {
                            yyval.tag.setenv = false;
                        }
 break;
 case 73:
-#line 640 "gram.y"
+#line 638 "gram.y"
 {
                            yyval.tag.log_input = true;
                        }
 break;
 case 74:
-#line 643 "gram.y"
+#line 641 "gram.y"
 {
                            yyval.tag.log_input = false;
                        }
 break;
 case 75:
-#line 646 "gram.y"
+#line 644 "gram.y"
 {
                            yyval.tag.log_output = true;
                        }
 break;
 case 76:
-#line 649 "gram.y"
+#line 647 "gram.y"
 {
                            yyval.tag.log_output = false;
                        }
 break;
 case 77:
-#line 652 "gram.y"
+#line 650 "gram.y"
 {
                            yyval.tag.send_mail = true;
                        }
 break;
 case 78:
-#line 655 "gram.y"
+#line 653 "gram.y"
 {
                            yyval.tag.send_mail = false;
                        }
 break;
 case 79:
-#line 660 "gram.y"
+#line 658 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -1862,7 +1860,7 @@ case 79:
                        }
 break;
 case 80:
-#line 667 "gram.y"
+#line 665 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -1872,7 +1870,7 @@ case 80:
                        }
 break;
 case 81:
-#line 674 "gram.y"
+#line 672 "gram.y"
 {
                            struct sudo_command *c = calloc(1, sizeof(*c));
                            if (c == NULL) {
@@ -1890,7 +1888,7 @@ case 81:
                        }
 break;
 case 84:
-#line 695 "gram.y"
+#line 693 "gram.y"
 {
                            const char *s;
                            if ((s = alias_add(yyvsp[-2].string, HOSTALIAS, yyvsp[0].member)) != NULL) {
@@ -1900,14 +1898,14 @@ case 84:
                        }
 break;
 case 86:
-#line 705 "gram.y"
+#line 703 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 89:
-#line 715 "gram.y"
+#line 713 "gram.y"
 {
                            const char *s;
                            if ((s = alias_add(yyvsp[-2].string, CMNDALIAS, yyvsp[0].member)) != NULL) {
@@ -1917,14 +1915,14 @@ case 89:
                        }
 break;
 case 91:
-#line 725 "gram.y"
+#line 723 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 94:
-#line 735 "gram.y"
+#line 733 "gram.y"
 {
                            const char *s;
                            if ((s = alias_add(yyvsp[-2].string, RUNASALIAS, yyvsp[0].member)) != NULL) {
@@ -1934,7 +1932,7 @@ case 94:
                        }
 break;
 case 97:
-#line 748 "gram.y"
+#line 746 "gram.y"
 {
                            const char *s;
                            if ((s = alias_add(yyvsp[-2].string, USERALIAS, yyvsp[0].member)) != NULL) {
@@ -1944,28 +1942,28 @@ case 97:
                        }
 break;
 case 99:
-#line 758 "gram.y"
+#line 756 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 100:
-#line 764 "gram.y"
+#line 762 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 101:
-#line 768 "gram.y"
+#line 766 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 102:
-#line 774 "gram.y"
+#line 772 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -1975,7 +1973,7 @@ case 102:
                        }
 break;
 case 103:
-#line 781 "gram.y"
+#line 779 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -1985,7 +1983,7 @@ case 103:
                        }
 break;
 case 104:
-#line 788 "gram.y"
+#line 786 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                            if (yyval.member == NULL) {
@@ -1995,7 +1993,7 @@ case 104:
                        }
 break;
 case 105:
-#line 795 "gram.y"
+#line 793 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, USERGROUP);
                            if (yyval.member == NULL) {
@@ -2005,7 +2003,7 @@ case 105:
                        }
 break;
 case 106:
-#line 802 "gram.y"
+#line 800 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                            if (yyval.member == NULL) {
@@ -2015,28 +2013,28 @@ case 106:
                        }
 break;
 case 108:
-#line 812 "gram.y"
+#line 810 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 109:
-#line 818 "gram.y"
+#line 816 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 110:
-#line 822 "gram.y"
+#line 820 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 111:
-#line 828 "gram.y"
+#line 826 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -2046,7 +2044,7 @@ case 111:
                        }
 break;
 case 112:
-#line 835 "gram.y"
+#line 833 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -2056,7 +2054,7 @@ case 112:
                        }
 break;
 case 113:
-#line 842 "gram.y"
+#line 840 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                            if (yyval.member == NULL) {
@@ -2065,7 +2063,7 @@ case 113:
                            }
                        }
 break;
-#line 2016 "gram.c"
+#line 2014 "gram.c"
     }
     yyssp -= yym;
     yystate = *yyssp;

diff --git a/plugins/sudoers/gram.y b/plugins/sudoers/gram.y
index ad336f4758c9855bb978a2fa4601d36cb966e567..0b9a249f03f0c93600d07dba1703da2939b1f6ed 100644 (file)
--- a/plugins/sudoers/gram.y
+++ b/plugins/sudoers/gram.y
@@ -34,9 +34,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)

diff --git a/plugins/sudoers/group_plugin.c b/plugins/sudoers/group_plugin.c
index 36d15ffc1c0e687fa32acc813eeaf6ed5356e242..467eaa4cda844ec6e18bf85732ad95276afebfde 100644 (file)
--- a/plugins/sudoers/group_plugin.c
+++ b/plugins/sudoers/group_plugin.c
@@ -27,9 +27,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/plugins/sudoers/interfaces.c b/plugins/sudoers/interfaces.c
index 47a62b4242f14434ce00f2c6cebe1d814ca2b595..45019a4c894fbd6383e2bb9f73d4a6513b3f021a 100644 (file)
--- a/plugins/sudoers/interfaces.c
+++ b/plugins/sudoers/interfaces.c
@@ -26,9 +26,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <netinet/in.h>  
 #include <arpa/inet.h>
 #include <netdb.h>

diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c
index 6fd214984ca3bbf1cb8ca479b8588c3c5404eab5..9a4f97c786af25f033c64490a6ee3df232f36df2 100644 (file)
--- a/plugins/sudoers/iolog.c
+++ b/plugins/sudoers/iolog.c
@@ -27,9 +27,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
index 540e13146bdb54332e5ebf4066ba77b2da9db822..887092a3bd009d3544ee2faed2edb332b349b324 100644 (file)
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -30,9 +30,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
index 8ac570a516df644fb1d959dad7ea35fe452f7fba..05f57986690d60d606b4f0ea20020e0ce75bb71d 100644 (file)
--- a/plugins/sudoers/logging.c
+++ b/plugins/sudoers/logging.c
@@ -36,9 +36,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef HAVE_NL_LANGINFO
 # include <langinfo.h>
 #endif /* HAVE_NL_LANGINFO */

diff --git a/plugins/sudoers/match.c b/plugins/sudoers/match.c
index 2db363517f60d5a6993edf171e19c7b7d534fc35..f69d2f32a0a44946b8e1a8ccf92d0f5ea211d6ef 100644 (file)
--- a/plugins/sudoers/match.c
+++ b/plugins/sudoers/match.c
@@ -41,9 +41,7 @@
 #elif defined(HAVE_INTTYPES_H)
 # include <inttypes.h>
 #endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifndef SUDOERS_NAME_MATCH
 # ifdef HAVE_GLOB
 #  include <glob.h>

diff --git a/plugins/sudoers/match_addr.c b/plugins/sudoers/match_addr.c
index 21de1a08e07fa528aa6be3c5718f796adaaa015d..91ffa857f2fdf6ae7d1f037eeb380c3769b18a2f 100644 (file)
--- a/plugins/sudoers/match_addr.c
+++ b/plugins/sudoers/match_addr.c
@@ -33,9 +33,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 

diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c
index f6ddff36484afc0c440a0ed41b632a76e625b468..793bbcf4ab65a3587c4ab30aad4e81cbc9000fe9 100644 (file)
--- a/plugins/sudoers/parse.c
+++ b/plugins/sudoers/parse.c
@@ -27,9 +27,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <pwd.h>
 #include <grp.h>

diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
index 5854ab7a68b4d89a863366ed32af708021ed4d2d..59fc1fa037c778abfdf81858f4f0a00edc2a33b0 100644 (file)
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -27,9 +27,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <grp.h>
 #include <pwd.h>

diff --git a/plugins/sudoers/pwutil.c b/plugins/sudoers/pwutil.c
index 9c516a0ee30c460319c90b9658199e7f7313ac03..6164494fee2d0104fa5bb234112d2d93328d79d3 100644 (file)
--- a/plugins/sudoers/pwutil.c
+++ b/plugins/sudoers/pwutil.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef HAVE_SETAUTHDB
 # include <usersec.h>
 #endif /* HAVE_SETAUTHDB */

diff --git a/plugins/sudoers/pwutil_impl.c b/plugins/sudoers/pwutil_impl.c
index 65fcf3a90cd067edb9b1713927c0defd82f0421d..03e61df4876416ab8d8d13f16f3ebc383e088605 100644 (file)
--- a/plugins/sudoers/pwutil_impl.c
+++ b/plugins/sudoers/pwutil_impl.c
@@ -30,9 +30,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <limits.h>
 #include <pwd.h>

diff --git a/plugins/sudoers/set_perms.c b/plugins/sudoers/set_perms.c
index 7fb44fee840875e4ed946babe39991c4aed53b26..af6cdc36ac07560fc9ca5afee596c6cf8aeb7f49 100644 (file)
--- a/plugins/sudoers/set_perms.c
+++ b/plugins/sudoers/set_perms.c
@@ -30,9 +30,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef _AIX
 # include <sys/id.h>
 #endif

diff --git a/plugins/sudoers/sssd.c b/plugins/sudoers/sssd.c
index 5c9cf1d0c680905690745d70545dd01eb73e2ecd..10234ed6b590364c16ba6484797751c308bfb75a 100644 (file)
--- a/plugins/sudoers/sssd.c
+++ b/plugins/sudoers/sssd.c
@@ -32,9 +32,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/plugins/sudoers/sudo_nss.c b/plugins/sudoers/sudo_nss.c
index e3d7e77b4a5e472b8a9213706c5235b2949e7a63..4f7f27aec71d213de54bdeec5ea9391f3b119f87 100644 (file)
--- a/plugins/sudoers/sudo_nss.c
+++ b/plugins/sudoers/sudo_nss.c
@@ -27,9 +27,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 #include <grp.h>
 #include <ctype.h>

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index 05d450fbd0cb5a0371747fa46c6f2092561a17a2..b6b9c7f21d586036e9ee7d7ca3d939a6febc49b5 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -36,9 +36,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/plugins/sudoers/sudoers_debug.c b/plugins/sudoers/sudoers_debug.c
index 3d3b7aa16004981d56031f5286422ab2d462f184..9dc8727fdb12e5b6af8ee53b9aecf5fdb2b8a4c0 100644 (file)
--- a/plugins/sudoers/sudoers_debug.c
+++ b/plugins/sudoers/sudoers_debug.c
@@ -30,9 +30,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 
 #include "sudoers.h"

diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index 5526da1d5aa2c8bd3d2d9637d1e79a869c9910c9..7fb8eacae8ddaf28afa484a6b4dc3fb178522413 100644 (file)
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -30,9 +30,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index e213d0cc26397ed7d0aa95980d10b973f5068e5f..20124a0f0179a7aba7d95cc489239df4572502aa 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -34,9 +34,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef HAVE_NETGROUP_H
 # include <netgroup.h>
 #endif /* HAVE_NETGROUP_H */

diff --git a/plugins/sudoers/timestamp.c b/plugins/sudoers/timestamp.c
index 3161a594da074eddd91688017a0a4a03630d9408..42abcd1e6f9eb345888125c92f89133b250ca89f 100644 (file)
--- a/plugins/sudoers/timestamp.c
+++ b/plugins/sudoers/timestamp.c
@@ -27,9 +27,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index eab4a054462752ab1453377f86e705b0b023c615..3c0ed3c40e18221a5eb11a635cc70c6435bd2225 100644 (file)
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -1974,9 +1974,7 @@ char *yytext;
 #elif defined(HAVE_INTTYPES_H)
 # include <inttypes.h>
 #endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)

diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
index 8781aebd66e1b6116f49471288beac235700c2e6..cea07e846a8b57fa9d5f3b873084c6385f30bfce 100644 (file)
--- a/plugins/sudoers/toke.l
+++ b/plugins/sudoers/toke.l
@@ -40,9 +40,7 @@
 #elif defined(HAVE_INTTYPES_H)
 # include <inttypes.h>
 #endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)

diff --git a/plugins/sudoers/toke_util.c b/plugins/sudoers/toke_util.c
index 52a0d7673ca13c504cbd99393a7fde968a43a3fb..87a56dd3b8969bc4fc47801110b5d5d4f632a6a7 100644 (file)
--- a/plugins/sudoers/toke_util.c
+++ b/plugins/sudoers/toke_util.c
@@ -33,9 +33,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudoers.h"

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 04fd5bc6f820de858d2134052d9f7eb6e169f8e3..a8ea9cf3fa0c3c0d8cb4a0e9bc5de1be08fcc711 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -46,9 +46,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <stdarg.h>
 #include <ctype.h>
 #include <pwd.h>

diff --git a/plugins/sudoers/visudo_json.c b/plugins/sudoers/visudo_json.c
index cbecbf8a6482c04837fef9f98ff6026478502e7c..9ae2751e0df06e7e9b00eaaed9f7000e951d7ae3 100644 (file)
--- a/plugins/sudoers/visudo_json.c
+++ b/plugins/sudoers/visudo_json.c
@@ -25,9 +25,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <stdarg.h>
 #include <ctype.h>
 

diff --git a/plugins/system_group/system_group.c b/plugins/system_group/system_group.c
index 7286627980722c61cf1817eb9ec423db4502d34e..6093fc32401c8345651c0132b07dd5ae28bd6d8e 100644 (file)
--- a/plugins/system_group/system_group.c
+++ b/plugins/system_group/system_group.c
@@ -32,9 +32,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/src/conversation.c b/src/conversation.c
index 7035f6c404bc118cea2cfacfbef7a644e6238bf2..cb752b88396700970c01844f785b96ceca344d05 100644 (file)
--- a/src/conversation.c
+++ b/src/conversation.c
@@ -29,9 +29,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudo.h"

diff --git a/src/exec.c b/src/exec.c
index c41dc3a1c0baac2b410be7964c00273781cb5240..b518bae71859ebca9d1ef437a7aa0738e6a21334 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -30,9 +30,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/src/exec_common.c b/src/exec_common.c
index 32e99fe521d8df3a30d6aa83a6475d5df43ee826..f29b550bc23718a4a813187ef7d6f974367d591c 100644 (file)
--- a/src/exec_common.c
+++ b/src/exec_common.c
@@ -25,9 +25,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef HAVE_PRIV_SET
 # include <priv.h>
 #endif

diff --git a/src/exec_pty.c b/src/exec_pty.c
index 58cd53c4625d9d787a2ef43de65533105d3848a0..947dd71264e97311b0bcb065546cbe0ea9a24194 100644 (file)
--- a/src/exec_pty.c
+++ b/src/exec_pty.c
@@ -29,9 +29,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif

diff --git a/src/get_pty.c b/src/get_pty.c
index e72db2c835028c561047699b2da67fcfad2c52a1..5ecd4cdb2e44ab16e94ca7b53b333e6b61d1198b 100644 (file)
--- a/src/get_pty.c
+++ b/src/get_pty.c
@@ -31,9 +31,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>

diff --git a/src/hooks.c b/src/hooks.c
index c64b69b203582ecf7f52f7136162fb9c7aa77838..ae918b3140cf3d4af2d076f50f4f53e3baaeb9aa 100644 (file)
--- a/src/hooks.c
+++ b/src/hooks.c
@@ -25,9 +25,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudo.h"

diff --git a/src/load_plugins.c b/src/load_plugins.c
index 95bdd830d0c6e00cd00b44dd45638b0a330bad25..d26a2b0cfa5033f5330ef9db3c010e84d93eda29 100644 (file)
--- a/src/load_plugins.c
+++ b/src/load_plugins.c
@@ -26,9 +26,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 
 #include "sudo.h"

diff --git a/src/net_ifs.c b/src/net_ifs.c
index f5d39e71f350b5ac53e015d319d3941c6f26f327..12961adf9fcfea0d83d400bc51a8cd902c4b9b78 100644 (file)
--- a/src/net_ifs.c
+++ b/src/net_ifs.c
@@ -50,9 +50,7 @@ struct rtentry;
 #else
 # include "compat/stdbool.h"
 #endif /* HAVE_STDBOOL_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <netdb.h>
 #include <errno.h>
 #ifdef _ISC

diff --git a/src/openbsd.c b/src/openbsd.c
index fb889e83c78e847e98757c0ee5254fd0a4ab8f5f..97213fca4d67375ae75326cceca9964723ca73d0 100644 (file)
--- a/src/openbsd.c
+++ b/src/openbsd.c
@@ -25,9 +25,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 
 #include "sudo.h"
 

diff --git a/src/parse_args.c b/src/parse_args.c
index 1d7da7639590c8cae252e1f74d3d30426160974c..28372f5bba2aa5c399f52ae9277a24fb811ff1bc 100644 (file)
--- a/src/parse_args.c
+++ b/src/parse_args.c
@@ -30,9 +30,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <grp.h>
 #include <pwd.h>

diff --git a/src/preserve_fds.c b/src/preserve_fds.c
index 00c73e29de32bc93dfaff48ad367a1ac5757af52..cbdd5e8e55af358bd383e76cf39291a4ae29a856 100644 (file)
--- a/src/preserve_fds.c
+++ b/src/preserve_fds.c
@@ -24,9 +24,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>

diff --git a/src/signal.c b/src/signal.c
index f1c875dc5f3d0ca2fa9ee3d3f460016538c12fac..888492fade4dceda20a04457cb292d93169beae6 100644 (file)
--- a/src/signal.c
+++ b/src/signal.c
@@ -25,9 +25,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <signal.h>
 

diff --git a/src/solaris.c b/src/solaris.c
index ec5e9ca9b5999946958a973343f193e11a489ae7..20b3846b20258dc0574cc2bcb9d4753eeca6ca6c 100644 (file)
--- a/src/solaris.c
+++ b/src/solaris.c
@@ -26,9 +26,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef HAVE_PROJECT_H
 # include <project.h>
 # include <sys/task.h>

diff --git a/src/sudo.c b/src/sudo.c
index 30a17931a0a041e13b59e67267670ffba2b760fa..3be4f183701ed0a9691bd812e94b3dfe87aa2fb0 100644 (file)
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -34,9 +34,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/src/sudo_edit.c b/src/sudo_edit.c
index 5c170405fc145d82f52910fe716710cf72d1a0d1..66460b06094ae559de24a9baa3bd923aaf5988e2 100644 (file)
--- a/src/sudo_edit.c
+++ b/src/sudo_edit.c
@@ -29,9 +29,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <ctype.h>
 #include <grp.h>
 #include <pwd.h>

diff --git a/src/sudo_noexec.c b/src/sudo_noexec.c
index 33ac2968d62b93f65748e92fec87c978f40b59ad..615f98b690cb9cb240350dc8b293e91c1f09cb13 100644 (file)
--- a/src/sudo_noexec.c
+++ b/src/sudo_noexec.c
@@ -20,9 +20,7 @@
 
 #include <errno.h>
 #include <stdarg.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef HAVE_SPAWN_H
 #include <spawn.h>
 #endif

diff --git a/src/tgetpass.c b/src/tgetpass.c
index 57a70cc2a08ff19f25a642e20887c922e15dac20..4786996abc5fc4d03ec9bdf24da903e8f22c4efe 100644 (file)
--- a/src/tgetpass.c
+++ b/src/tgetpass.c
@@ -35,9 +35,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <pwd.h>
 #include <errno.h>
 #include <signal.h>

diff --git a/src/ttyname.c b/src/ttyname.c
index fd56f0105a13d3fd515568d5bd179a9335e6ec01..fa24fbbd995240a795f19dd886b63cdfc8ef94d3 100644 (file)
--- a/src/ttyname.c
+++ b/src/ttyname.c
@@ -37,9 +37,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>

diff --git a/src/utmp.c b/src/utmp.c
index 0dd4de75d02ab5eedcbb2d4e151e169549bd35bb..7929a04fa91d154ad6aab67fc1cff8edd4148531 100644 (file)
--- a/src/utmp.c
+++ b/src/utmp.c
@@ -27,9 +27,7 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif