diff options
| -rw-r--r-- | usr/src/cmd/svc/configd/rc_node.c | 27 | ||||
| -rw-r--r-- | usr/src/uts/intel/bnxe/Makefile | 1 |
2 files changed, 11 insertions, 17 deletions
diff --git a/usr/src/cmd/svc/configd/rc_node.c b/usr/src/cmd/svc/configd/rc_node.c index 8071918074..33cb2be7a2 100644 --- a/usr/src/cmd/svc/configd/rc_node.c +++ b/usr/src/cmd/svc/configd/rc_node.c @@ -392,17 +392,6 @@ #define MAX_VALID_CHILDREN 3 -/* - * The ADT_smf_* symbols may not be defined on the build machine. Because - * of this, we do not want to compile the _smf_aud_event() function when - * doing native builds. - */ -#ifdef NATIVE_BUILD -#define smf_audit_event(i, s, r, d) -#else -#define smf_audit_event(i, s, r, d) _smf_audit_event(i, s, r, d) -#endif /* NATIVE_BUILD */ - typedef struct rc_type_info { uint32_t rt_type; /* matches array index */ uint32_t rt_num_ids; @@ -3396,7 +3385,7 @@ rc_node_modify_permission_check(char **match_auth) * only on the Solaris build machines to create the seed repository, and it * is compiled against the build machine's header files. The ADT_smf_* * symbols may not be defined in these header files. For this reason - * smf_annotation_event(), _smf_audit_event() and special_property_event() + * smf_annotation_event(), smf_audit_event() and special_property_event() * are not compiled for native builds. */ #ifndef NATIVE_BUILD @@ -3447,17 +3436,19 @@ smf_annotation_event(int status, int return_val) } adt_free_event(event); } +#endif /* - * _smf_audit_event interacts with the security auditing system to generate + * smf_audit_event interacts with the security auditing system to generate * an audit event structure. It establishes an audit session and allocates * an audit event. The event is filled in from the audit data, and * adt_put_event is called to generate the event. */ static void -_smf_audit_event(au_event_t event_id, int status, int return_val, +smf_audit_event(au_event_t event_id, int status, int return_val, audit_event_data_t *data) { +#ifndef NATIVE_BUILD char *auth_used; char *fmri; char *prop_value; @@ -3472,7 +3463,7 @@ _smf_audit_event(au_event_t event_id, int status, int return_val, if ((session = get_audit_session()) == NULL) return; if ((event = adt_alloc_event(session, event_id)) == NULL) { - uu_warn("_smf_audit_event cannot allocate event " + uu_warn("smf_audit_event cannot allocate event " "data. %s\n", strerror(errno)); return; } @@ -3487,7 +3478,7 @@ _smf_audit_event(au_event_t event_id, int status, int return_val, auth_used = data->ed_auth; } if (data->ed_fmri == NULL) { - syslog(LOG_WARNING, "_smf_audit_event called with " + syslog(LOG_WARNING, "smf_audit_event called with " "empty FMRI string"); fmri = "UNKNOWN FMRI"; } else { @@ -3627,12 +3618,14 @@ _smf_audit_event(au_event_t event_id, int status, int return_val, } if (adt_put_event(event, status, return_val) != 0) { - uu_warn("_smf_audit_event failed to put event. %s\n", + uu_warn("smf_audit_event failed to put event. %s\n", strerror(errno)); } adt_free_event(event); +#endif } +#ifndef NATIVE_BUILD /* * Determine if the combination of the property group at pg_name and the * property at prop_name are in the set of special startd properties. If diff --git a/usr/src/uts/intel/bnxe/Makefile b/usr/src/uts/intel/bnxe/Makefile index cbe06319be..ff44f0d4d8 100644 --- a/usr/src/uts/intel/bnxe/Makefile +++ b/usr/src/uts/intel/bnxe/Makefile @@ -93,6 +93,7 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-function CERRWARN += -_gcc=-Wno-unused-value CERRWARN += -_gcc=-Wno-unused-variable +CERRWARN += -_gcc=-Wno-unused-but-set-variable CERRWARN += -_cc=-erroff=E_STATEMENT_NOT_REACHED CERRWARN += -_cc=-erroff=E_ARGUEMENT_MISMATCH CERRWARN += -_cc=-erroff=E_INTEGER_OVERFLOW_DETECTED |