| author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
| Fri, 21 Mar 2014 00:13:55 -0700 | |
| branch | s11-update |
| changeset 2996 | 9d8e1fd67549 |
| parent 2705 | e39a44e3cb41 |
| permissions | -rw-r--r-- |
|
2705
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
1 |
This patch closes the system_info probe session, as soon as the sysinfo is |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
2 |
queried. This prevents system_info probes from hanging around till the process |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
3 |
completes. |
|
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 |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
5 |
2013-Jul-12. |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
6 |
|
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
7 |
--- openscap-0.9.7/src/OVAL/oval_agent.c.~1~ 2013-04-23 06:21:51.236000001 -0700 |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
8 |
+++ openscap-0.9.7/src/OVAL/oval_agent.c 2013-06-13 18:01:31.297731735 -0700 |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
9 |
@@ -107,6 +107,10 @@ |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
10 |
oscap_free(ag_sess); |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
11 |
return NULL; |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
12 |
} |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
13 |
+#if defined(__SVR4) && defined(__sun) |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
14 |
+ oval_probe_session_destroy(ag_sess->psess); |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
15 |
+ ag_sess->psess = oval_probe_session_new(ag_sess->sys_model); |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
16 |
+#endif |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
17 |
oval_syschar_model_set_sysinfo(ag_sess->sys_model, sysinfo); |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
18 |
oval_sysinfo_free(sysinfo); |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
19 |