--- a/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java	Tue Apr 16 13:51:53 2013 -0400
+++ b/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java	Thu Apr 18 11:13:18 2013 +0100
@@ -394,9 +394,9 @@
         if (filter == null)
             throw new NullPointerException();
 
-        // can't return SecureDirectoryStream on kernels that don't support
-        // openat, etc.
-        if (!supportsAtSysCalls() || !supportsNoFollowLinks()) {
+        // can't return SecureDirectoryStream on kernels that don't support openat
+        // or O_NOFOLLOW
+        if (!openatSupported() || O_NOFOLLOW == 0) {
             try {
                 long ptr = opendir(dir);
                 return new UnixDirectoryStream(dir, ptr, filter);