| author | pnyc <petr.nyc@oracle.com> |
| Fri, 08 Jan 2016 00:23:32 -0800 | |
| branch | s11u3-sru |
| changeset 5245 | 72dbb2d375cc |
| parent 3910 | 7a5d3958d427 |
| child 7627 | 4758b76d5ad5 |
| permissions | -rw-r--r-- |
|
3910
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
# Internal patch. |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
# Do not return true if euid == 0 and file does not have the execute bit set. |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
--- lib/sh/eaccess.c 2015-02-26 14:23:13.619717483 -0800 |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
+++ lib/sh/eaccess.c 2015-02-26 14:29:09.644569957 -0800 |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
@@ -208,8 +208,10 @@ |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
if (path_is_devfd (path)) |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
return (sh_stataccess (path, mode)); |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
|
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
-#if defined (HAVE_EACCESS) /* FreeBSD */ |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
+#if defined(HAVE_EACCESS) && !defined(SOLARIS) /* FreeBSD */ |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
return (eaccess (path, mode)); |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
+#elif defined(SOLARIS) |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
+ return (sh_stataccess (path, mode)); |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
#elif defined (EFF_ONLY_OK) /* SVR4(?), SVR4.2 */ |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
return access (path, mode|EFF_ONLY_OK); |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
#else |