author | Lijo George - Oracle Corporation - Bangalore India <lijo.x.george@oracle.com> |
Mon, 24 Mar 2014 15:04:05 -0700 | |
branch | s11-update |
changeset 3004 | 856505663cc3 |
parent 2821 | 8add1494802c |
child 3595 | 3fab3649e6cd |
permissions | -rw-r--r-- |
2821
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
1 |
Fixed issue with file probe not returning has_extended_acl on solaris. |
2705
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
2 |
This patch fixes the file probe from crashing on solaris when encountering file |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
3 |
types of door and port. |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
4 |
This patch has not been contributed upstream, but is planned to be done by |
2821
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
5 |
2013-Jul-12. |
2705
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
6 |
|
2821
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
7 |
--- openscap-0.9.7/src/OVAL/probes/unix/file.c.~1~ 2013-04-23 06:21:51.447000001 -0700 |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
8 |
+++ openscap-0.9.7/src/OVAL/probes/unix/file.c 2013-08-16 13:04:51.171523322 -0700 |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
9 |
@@ -77,6 +77,9 @@ |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
10 |
#else |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
11 |
# error "Sorry, your OS isn't supported." |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
12 |
#endif |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
13 |
+#if defined(__SVR4) && defined(__sun) |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
14 |
+#include <sys/acl.h> |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
15 |
+#endif |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
16 |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
17 |
oval_version_t over; |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
18 |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
19 |
@@ -84,6 +87,9 @@ |
2705
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
20 |
static SEXP_t *gr_t_dir = NULL, *gr_t_lnk = NULL, *gr_t_blk = NULL; |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
21 |
static SEXP_t *gr_t_fifo = NULL, *gr_t_sock = NULL, *gr_t_char = NULL; |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
22 |
static SEXP_t gr_lastpath; |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
23 |
+#if defined(__SVR4) && defined(__sun) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
24 |
+static SEXP_t *gr_t_door = NULL, *gr_t_port = NULL; |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
25 |
+#endif |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
26 |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
27 |
static SEXP_t *se_filetype (mode_t mode) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
28 |
{ |
2821
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
29 |
@@ -95,6 +101,10 @@ |
2705
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
30 |
case S_IFIFO: return (gr_t_fifo); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
31 |
case S_IFSOCK: return (gr_t_sock); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
32 |
case S_IFCHR: return (gr_t_char); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
33 |
+#if defined(__SVR4) && defined(__sun) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
34 |
+ case S_IFDOOR: return (gr_t_door); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
35 |
+ case S_IFPORT: return (gr_t_port); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
36 |
+#endif |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
37 |
default: |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
38 |
abort (); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
39 |
} |
2821
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
40 |
@@ -286,8 +297,12 @@ |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
41 |
se_acl = acl_extended_file(st_path) ? gr_true : gr_false; |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
42 |
} |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
43 |
#else |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
44 |
+#if defined(__SVR4) && defined(__sun) |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
45 |
+ se_acl = acl_trivial(st_path) ? gr_true : gr_false; |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
46 |
+#else |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
47 |
se_acl = NULL; |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
48 |
#endif |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
49 |
+#endif |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
50 |
|
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
51 |
item = probe_item_create(OVAL_UNIX_FILE, NULL, |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
52 |
"filepath", OVAL_DATATYPE_SEXP, se_filepath, |
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
53 |
@@ -355,6 +370,10 @@ |
2705
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
54 |
#define STR_SOCKET "socket" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
55 |
#define STR_CHARSPEC "character special" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
56 |
#define STRLEN_PAIR(str) (str), strlen(str) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
57 |
+#if defined(__SVR4) && (__sun) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
58 |
+#define STR_DOOR "door" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
59 |
+#define STR_PORT "port" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
60 |
+#endif |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
61 |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
62 |
gr_t_reg = SEXP_string_new (STRLEN_PAIR(STR_REGULAR)); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
63 |
gr_t_dir = SEXP_string_new (STRLEN_PAIR(STR_DIRECTORY)); |
2821
8add1494802c
17270625 textfilecontent54 probe fails to match patterns in file XScreensaver
Jacob Varughese <jacob.varughese@oracle.com>
parents:
2705
diff
changeset
|
64 |
@@ -363,6 +382,10 @@ |
2705
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
65 |
gr_t_fifo = SEXP_string_new (STRLEN_PAIR(STR_FIFO)); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
66 |
gr_t_sock = SEXP_string_new (STRLEN_PAIR(STR_SOCKET)); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
67 |
gr_t_char = SEXP_string_new (STRLEN_PAIR(STR_CHARSPEC)); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
68 |
+#if defined(__SVR4) && (__sun) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
69 |
+ gr_t_door = SEXP_string_new (STRLEN_PAIR(STR_DOOR)); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
70 |
+ gr_t_port = SEXP_string_new (STRLEN_PAIR(STR_PORT)); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
71 |
+#endif |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
72 |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
73 |
SEXP_init(&gr_lastpath); |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
74 |