Handle the case where O_PATH or O_SEARCH is defined but O_DIRECTORY

is not.  In theory, O_DIRECTORY is redundant when O_SEARCH is
specified but it is legal for O_EXEC and O_SEARCH to have the same
value.  Bug #844

diff --git a/src/sudo_edit.c b/src/sudo_edit.c
index 7b01fc44ba464744dd51ceab1620866c656b27a2..acf0280507304b50b800672c5057edf287727c8f 100644 (file)
--- a/src/sudo_edit.c
+++ b/src/sudo_edit.c
@@ -379,13 +379,21 @@ done:
  * Use O_SEARCH/O_PATH and/or O_DIRECTORY where possible.
  */
 #if defined(O_SEARCH)
-# define DIR_OPEN_FLAGS        (O_SEARCH|O_DIRECTORY)
+# if defined(O_DIRECTORY)
+#  define DIR_OPEN_FLAGS       (O_SEARCH|O_DIRECTORY)
+# else
+#  define DIR_OPEN_FLAGS       (O_SEARCH)
+# endif
 #elif defined(O_PATH)
-# define DIR_OPEN_FLAGS        (O_PATH|O_DIRECTORY)
+# if defined(O_DIRECTORY)
+#  define DIR_OPEN_FLAGS       (O_PATH|O_DIRECTORY)
+# else
+#  define DIR_OPEN_FLAGS       (O_PATH)
+# endif
 #elif defined(O_DIRECTORY)
-# define DIR_OPEN_FLAGS        (O_RDONLY|O_DIRECTORY)
+# define DIR_OPEN_FLAGS                (O_RDONLY|O_DIRECTORY)
 #else
-# define DIR_OPEN_FLAGS        (O_RDONLY|O_NONBLOCK)
+# define DIR_OPEN_FLAGS                (O_RDONLY|O_NONBLOCK)
 #endif
 
 static int