We still need to include string.h for AIX (and possibly others)

when we are not using the system memset_r() function and rsize_t
is defined by the system headers.

diff --git a/include/sudo_compat.h b/include/sudo_compat.h
index 1355f950a2e7fe094f6ab396be0ff4a63dac619b..b5fb9bfb4b68400c997af01226eb3527fe035df6 100644 (file)
--- a/include/sudo_compat.h
+++ b/include/sudo_compat.h
@@ -24,9 +24,12 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#ifndef HAVE_MEMSET_S
+#if !defined(HAVE_MEMSET_S) && !defined(rsize_t)
 # include <stddef.h>   /* for rsize_t */
-#endif /* HAVE_MEMSET_S */
+# ifdef HAVE_STRING_H
+#  include <string.h>  /* for rsize_t on AIX */
+# endif /* HAVE_STRING_H */
+#endif /* HAVE_MEMSET_S && rsize_t */
 
 /*
  * Macros and functions that may be missing on some operating systems.