hurd: Fix O_DIRECTORY | O_NOFOLLOW

Appending / to the path to be looked up makes us always follow a final
symlink, even with O_NOTRANS (since the final resolution is after the
'/').  In the O_DIRECTORY | O_NOFOLLOW case, we thus have to really open
the node and stat it, which we already do anyway, and check for
directory type.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name tg-NOFOLLOW-DIRECTORY.diff

diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c
index 1861d5879db9402e094b25df40d0036f17bfe55c..fd161bdb5d9d0597b82f7e301980dc8c67130b8f 100644 (file)
--- a/hurd/hurdlookup.c
+++ b/hurd/hurdlookup.c
@@ -72,7 +72,7 @@ __hurd_file_name_lookup (error_t (*use_init_port)
   if (flags & O_NOFOLLOW)      /* See lookup-retry.c about O_NOFOLLOW.  */
     flags |= O_NOTRANS;
 
-  if (flags & O_DIRECTORY)
+  if (flags & O_DIRECTORY && !(flags & O_NOFOLLOW))
     {
       /* The caller wants to require that the file we look up is a directory.
         We can do this without an extra RPC by appending a trailing slash

diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c
index 31376ef56c2295beb7847ade08afb26780b6b364..1115d4b929096b3914077d7746528d441a6cd955 100644 (file)
--- a/hurd/lookup-retry.c
+++ b/hurd/lookup-retry.c
@@ -147,6 +147,8 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
                  err = __io_stat (*result, &st);
                  if (!err)
                    {
+                     if (flags & O_DIRECTORY && !S_ISDIR(st.st_mode))
+                       err = ENOTDIR;
                      if (S_ISLNK(st.st_mode))
                        err = ELOOP;
                      else if (st.st_mode & (S_IPTRANS|S_IATRANS))