From: Jim Meyering <meyering@redhat.com>
Date: Sat, 10 May 2008 13:15:11 +0000 (+0200)
Subject: Make chdir-safer.c slightly safer.
X-Git-Tag: v0.1~7417
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=5b66f060813b0b6042c0814ec1ab06e65f775063;p=gnulib.git

Make chdir-safer.c slightly safer.

* lib/chdir-safer.c (chdir_no_follow): Test HAVE_WORKING_O_NOFOLLOW,
not O_NOFOLLOW, in case the latter is nonzero and open ignores it.
---

diff --git a/ChangeLog b/ChangeLog
index 94fbdc1ee..67653c119 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-05-10  Jim Meyering  <meyering@redhat.com>
 
+	Make chdir-safer.c slightly safer.
+	* lib/chdir-safer.c (chdir_no_follow): Test HAVE_WORKING_O_NOFOLLOW,
+	not O_NOFOLLOW, in case the latter is nonzero and open ignores it.
+
 	Avoid compile failure on systems without ELOOP (like mingw).
 	* lib/chdir-safer.c (ELOOP): Define if not already defined.
 	Reported by Bruno Haible.
diff --git a/lib/chdir-safer.c b/lib/chdir-safer.c
index 0df0b9da1..a5c9a4d12 100644
--- a/lib/chdir-safer.c
+++ b/lib/chdir-safer.c
@@ -51,7 +51,7 @@ chdir_no_follow (char const *dir)
      they are the same file; if they are different files, set errno to
      ELOOP (the same value that open uses for symlinks with
      O_NOFOLLOW) so the caller can report a failure.  */
-  if (! O_NOFOLLOW)
+  if (! HAVE_WORKING_O_NOFOLLOW)
     {
       struct stat sb1;
       result = lstat (dir, &sb1);