| author | Jacob Varughese <jacob.varughese@oracle.com> |
| Fri, 10 Oct 2014 14:31:54 -0700 | |
| branch | s11u2-sru |
| changeset 3380 | ab1cb904871a |
| parent 2821 | 8add1494802c |
| permissions | -rw-r--r-- |
|
2821
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
1 |
Fixed issue with textfilecontent54 not matching patterns in certain files on |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
2 |
solaris. |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
3 |
|
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
4 |
--- openscap-0.9.7/src/OVAL/probes/independent/textfilecontent54.c.~1~ 2013-04-23 06:21:51.427000001 -0700 |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
5 |
+++ openscap-0.9.7/src/OVAL/probes/independent/textfilecontent54.c 2013-08-20 09:38:16.335266038 -0700 |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
6 |
@@ -72,7 +72,11 @@ |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
7 |
for (i = 0; i < ovector_len; ++i) |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
8 |
ovector[i] = -1; |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
9 |
|
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
10 |
+#if defined(__SVR4) && defined(__sun) |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
11 |
+ rc = pcre_exec(re, NULL, str, strlen(str), *ofs, PCRE_NO_UTF8_CHECK, ovector, ovector_len); |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
12 |
+#else |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
13 |
rc = pcre_exec(re, NULL, str, strlen(str), *ofs, 0, ovector, ovector_len); |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
14 |
+#endif |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
15 |
|
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
16 |
if (rc < -1) {
|
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
17 |
return -1; |