1 20312342 compliance command fails when ipmp group is defined 

     2 

     3 This fix prevents the probe from reporting failure when it is not able

     4  to probe network interfaces, for e.g. on cluster machines with failover.

     5 

     6 The s12 version (which also contains infrastructure fixes) is going upstream.

     7 

     8 --- openscap-1.2.0/src/OVAL/probes/independent/system_info.c.~5~	2015-01-12 09:34:43.204367626 -0800

     9 +++ openscap-1.2.0/src/OVAL/probes/independent/system_info.c	2015-01-12 09:30:40.087375833 -0800

    10 @@ -232,7 +232,7 @@

    11  leave2:

    12          close(fd);

    13  #if defined(__SVR4) && defined(__sun)

    14 -	if (item_added == 0 && rc == 0) {

    15 +	if (item_added == 0) {

    16  		attrs = probe_attr_creat("name",

    17  					 r0 = SEXP_string_newf("dummy0"),

    18  					 "ip_address",

    19 @@ -243,6 +243,9 @@

    20  		probe_item_ent_add(item, "interface", attrs, NULL);

    21  		SEXP_vfree(attrs, r0, r1, r2, NULL);

    22  	}

    23 + /* if not able to get info on interfaces, do not fail. */

    24 +	if (rc > 0) 

    25 +		rc = 0;

    26  #endif

    27  leave1:

    28          freeifaddrs(ifaddr);