| author | Jacob Varughese <jacob.varughese@oracle.com> |
| Wed, 07 Jan 2015 11:38:53 -0800 | |
| changeset 3595 | 3fab3649e6cd |
| parent 1502 | 89c98773d0af |
| permissions | -rw-r--r-- |
|
3595
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
1 |
This patch is required to fix file probe to support the has_extended_acl |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
2 |
attribute in OVAL. |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
3 |
This patch has not been contributed to upstream, but is planned to be |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
4 |
completed by 2015-Jan-31. |
|
1369
20813e08fff3
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
5 |
|
|
3595
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
6 |
--- openscap-1.1.1/src/OVAL/probes/unix/file.c~1~ 2014-10-27 12:41:33.138555312 -0700 |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
7 |
+++ openscap-1.1.1/src/OVAL/probes/unix/file.c 2014-10-27 12:40:05.815261373 -0700 |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
8 |
@@ -261,7 +261,7 @@ |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
9 |
} |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
10 |
return (has_acl == 1) ? gr_true : gr_false; |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
11 |
#elif defined(OS_SOLARIS) |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
12 |
- return acl_trivial(st_path) ? gr_true : gr_false; |
|
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
13 |
+ return acl_trivial(path) ? gr_true : gr_false; |
|
1502
89c98773d0af
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
14 |
#else |
|
3595
3fab3649e6cd
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1502
diff
changeset
|
15 |
return NULL; |
|
1502
89c98773d0af
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
16 |
#endif |