Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openscap/patches/file.c.patch
author Jacob Varughese <jacob.varughese@oracle.com>
Fri, 13 Feb 2015 12:30:50 -0800
branchs11-update
changeset 3806 bdc70b98921a
parent 2821 8add1494802c
permissions -rw-r--r--
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC 20002615 upgrade openscap to latest version 1.2.0 20465100 openscap needs to have ASLR enabled
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3806
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
     1
 
This patch is required to fix file probe to support the has_extended_acl
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
     2
 
attribute in OVAL.
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
     3
 
This patch has not been contributed to upstream, but is planned to be
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
     4
 
completed by 2015-Jan-31.
2705
e39a44e3cb41 16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     5
3806
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
     6
 
--- openscap-1.1.1/src/OVAL/probes/unix/file.c~1~	2014-10-27 12:41:33.138555312 -0700
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
     7
 
+++ openscap-1.1.1/src/OVAL/probes/unix/file.c	2014-10-27 12:40:05.815261373 -0700
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
     8
 
@@ -261,7 +261,7 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
     9
 
 	}
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
    10
 
 	return (has_acl == 1) ? gr_true : gr_false;
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
    11
 
 #elif defined(OS_SOLARIS)
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
    12
 
-	return acl_trivial(st_path) ? gr_true : gr_false;
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
    13
 
+	return acl_trivial(path) ? gr_true : gr_false;
2821
8add1494802c 17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2705
diff changeset 
    14
 
 #else
3806
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2821
diff changeset 
    15
 
 	return NULL;
2821
8add1494802c 17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents: 2705
diff changeset 
    16
 
 #endif
upstream/oracle/userland-gate