diff options
Diffstat (limited to 'usr/src/lib/libbsm')
| -rw-r--r-- | usr/src/lib/libbsm/audit_event.txt | 37 | ||||
| -rw-r--r-- | usr/src/lib/libbsm/auditxml | 1 | ||||
| -rw-r--r-- | usr/src/lib/libbsm/common/adt.c | 16 | ||||
| -rw-r--r-- | usr/src/lib/libbsm/common/adt.xml | 374 | ||||
| -rw-r--r-- | usr/src/lib/libbsm/common/mapfile-vers | 1 |
5 files changed, 10 insertions, 419 deletions
diff --git a/usr/src/lib/libbsm/audit_event.txt b/usr/src/lib/libbsm/audit_event.txt index a7b6e2a7fa..64c88e3676 100644 --- a/usr/src/lib/libbsm/audit_event.txt +++ b/usr/src/lib/libbsm/audit_event.txt @@ -448,43 +448,6 @@ 6245:AUE_smbd_logoff:smbd(1m) session logoff:lo 6246:AUE_vscan_quarantine:vscand(1m) quarantine infected file:na # -# SMF(5) svc.configd events (svcadm(1M) related) -# -6250:AUE_smf_enable:persistently enable service instance:ss -6251:AUE_smf_tmp_enable:temporarily enable service instance:ss -6252:AUE_smf_disable:persistently disable service instance:ss -6253:AUE_smf_tmp_disable:temporarily disable service instance:ss -6254:AUE_smf_restart:restart service instance:ss -6255:AUE_smf_refresh:refresh service instance:ss -6256:AUE_smf_clear:clear service instance state:ss -6257:AUE_smf_degrade:set service instance degraded state:ss -6258:AUE_smf_immediate_degrade:immediately set service instance degraded state:ss -6259:AUE_smf_maintenance:set service instance persistent maintenance state:ss -6260:AUE_smf_immediate_maintenance:immediately set service instance persistent maintenance state:ss -6261:AUE_smf_immtmp_maintenance:immediately set service instance temporary maintenance state:ss -6262:AUE_smf_tmp_maintenance:set service instance maintenance temporary state:ss -6263:AUE_smf_milestone:set service management facility milestone:ss -# -# SMF(5) svc.configd miscellaneous events -# -6265:AUE_smf_read_prop:read restricted access property value:as -# -# SMF(5) svc.configd events (svccfg(1M) related) -# -6270:AUE_smf_create:create service instance object:as -6271:AUE_smf_delete:delete service instance object:as -6272:AUE_smf_create_pg:create persistent service property group:as -6273:AUE_smf_create_npg:create non-persistent service property group:as -6274:AUE_smf_delete_pg:delete persistent service property group:as -6275:AUE_smf_delete_npg:delete non-persistent service property group:as -6276:AUE_smf_create_snap:create repository snapshot:as -6277:AUE_smf_delete_snap:delete repository snapshot:as -6278:AUE_smf_attach_snap:attach repository snapshot:as -6279:AUE_smf_annotation:annotate transaction:as,ss -6280:AUE_smf_create_prop:create service instance property:as -6281:AUE_smf_change_prop:change service instance property:as -6282:AUE_smf_delete_prop:delete service instance property:as -# # Trusted Extensions events: # 9035:AUE_sl_change:Workspace label change:ap diff --git a/usr/src/lib/libbsm/auditxml b/usr/src/lib/libbsm/auditxml index 40c8a059bc..6392ecb631 100644 --- a/usr/src/lib/libbsm/auditxml +++ b/usr/src/lib/libbsm/auditxml @@ -534,7 +534,6 @@ extern void adt_set_termid(const adt_session_data_t *, extern void adt_get_asid(const adt_session_data_t *, au_asid_t *); extern void adt_set_asid(const adt_session_data_t *, const au_asid_t); -extern au_id_t adt_get_unique_id(au_id_t); #endif diff --git a/usr/src/lib/libbsm/common/adt.c b/usr/src/lib/libbsm/common/adt.c index 656c32eecd..473ecbcc51 100644 --- a/usr/src/lib/libbsm/common/adt.c +++ b/usr/src/lib/libbsm/common/adt.c @@ -192,8 +192,8 @@ adt_get_mask_from_user(uid_t uid, au_mask_t *mask) * see a need to put a lock around it. */ -au_id_t -adt_get_unique_id(au_id_t uid) +static au_id_t +adt_get_unique_id(uid_t uid) { char hostname[MAXHOSTNAMELEN]; union { @@ -480,10 +480,10 @@ adt_set_termid(const adt_session_data_t *session_data, ADT_VALID); ((adt_internal_state_t *)session_data)->as_info.ai_termid = - *termid; + *termid; ((adt_internal_state_t *)session_data)->as_have_user_data |= - ADT_HAVE_TID; + ADT_HAVE_TID; } } @@ -649,7 +649,7 @@ adt_get_hostIP(const char *hostname, au_tid_addr_t *p_term) case AF_INET6: /* LINTED */ p = &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr, - (void) memcpy(p_term->at_addr, p, + (void) memcpy(p_term->at_addr, p, sizeof (((struct sockaddr_in6 *)NULL)->sin6_addr)); p_term->at_type = AU_IPv6; break; @@ -1515,9 +1515,9 @@ adt_changeuser(adt_internal_state_t *state, uid_t ruid) state->as_info.ai_mask.am_failure |= mask.am_failure; } DPRINTF(("changed mask to %08X/%08X for ruid=%d\n", - state->as_info.ai_mask.am_success, - state->as_info.ai_mask.am_failure, - ruid)); + state->as_info.ai_mask.am_success, + state->as_info.ai_mask.am_failure, + ruid)); return (0); } diff --git a/usr/src/lib/libbsm/common/adt.xml b/usr/src/lib/libbsm/common/adt.xml index 4451af0abc..b0d2ccfb69 100644 --- a/usr/src/lib/libbsm/common/adt.xml +++ b/usr/src/lib/libbsm/common/adt.xml @@ -1284,378 +1284,8 @@ Use is subject to license terms. </entry> </event> -<!-- SMF related events --> - <event id="AUE_smf_generic" type="generic" omit="always"> - <!-- - This is a template for the event types that have no tokens - other than the header and return. There is no allowed_type - list because the template is not externally visible due to the - omit="always". - --> - <entry id="subject"> - <internal token="subject"/> - <external opt="none"/> - </entry> - <entry id="auth_used"> - <internal token="uauth"/> - <external opt="required" type="char *"/> - <comment>authorization used</comment> - </entry> - <entry id="fmri"> - <internal token="fmri"/> - <external opt="required" type="char *"/> - <comment>name</comment> - </entry> - <entry id="return"> - <internal token="return"/> - <external opt="none"/> - </entry> - </event> - - <event id="AUE_smf_generic_pg" type="generic" omit="always"> - <!-- - This is a template for the event types related to property groups. - There is no allowed_type list because the template is not externally - visible due to the omit="always". - --> - <entry id="subject"> - <internal token="subject"/> - <external opt="none"/> - </entry> - <entry id="auth_used"> - <internal token="uauth"/> - <external opt="required" type="char *"/> - <comment>authorization used</comment> - </entry> - <entry id="fmri"> - <internal token="fmri"/> - <external opt="required" type="char *"/> - </entry> - <entry id="type"> - <internal token="text"/> - <external opt="required" type="char *"/> - <comment>property group type</comment> - </entry> - <entry id="return"> - <internal token="return"/> - <external opt="none"/> - </entry> - </event> - - <event id="AUE_smf_enable" instance_of="AUE_smf_generic" header="0" - idNo="60" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_tmp_enable" instance_of="AUE_smf_generic" header="0" - idNo="61" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_disable" instance_of="AUE_smf_generic" header="0" - idNo="62" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_tmp_disable" instance_of="AUE_smf_generic" header="0" - idNo="63" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_restart" instance_of="AUE_smf_generic" header="0" - idNo="64" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_refresh" instance_of="AUE_smf_generic" header="0" - idNo="65" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_clear" instance_of="AUE_smf_generic" header="0" - idNo="66" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_degrade" instance_of="AUE_smf_generic" header="0" - idNo="67" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_immediate_degrade" instance_of="AUE_smf_generic" - header="0" idNo="68" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_maintenance" instance_of="AUE_smf_generic" header="0" - idNo="69" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_immediate_maintenance" instance_of="AUE_smf_generic" - header="0" idNo="70" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_immtmp_maintenance" instance_of="AUE_smf_generic" - header="0" idNo="71" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_tmp_maintenance" instance_of="AUE_smf_generic" header="0" - idNo="72" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - <event id="AUE_smf_milestone" instance_of="AUE_smf_generic" header="0" - idNo="73" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> - </event> - - <event id="AUE_smf_create" instance_of="AUE_smf_generic" header="0" - idNo="74" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - </event> - <event id="AUE_smf_delete" instance_of="AUE_smf_generic" header="0" - idNo="75" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - </event> - - <event id="AUE_smf_create_pg" instance_of="AUE_smf_generic_pg" header="0" - idNo="76" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - </event> - <event id="AUE_smf_create_npg" instance_of="AUE_smf_generic_pg" header="0" - idNo="77" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - </event> - <event id="AUE_smf_delete_pg" instance_of="AUE_smf_generic_pg" header="0" - idNo="78" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - </event> - <event id="AUE_smf_delete_npg" instance_of="AUE_smf_generic_pg" header="0" - idNo="79" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - </event> - - <event id="AUE_smf_create_snap" header="0" idNo="80" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - <entry id="subject"> - <internal token="subject"/> - <external opt="none"/> - </entry> - <entry id="auth_used"> - <internal token="uauth"/> - <external opt="required" type="char *"/> - <comment>authorization used</comment> - </entry> - <entry id="fmri"> - <internal token="fmri"/> - <external opt="required" type="char *"/> - <comment>name</comment> - </entry> - <entry id="name"> - <internal token="text"/> - <external opt="required" type="char *"/> - <comment>snapshot name</comment> - </entry> - <entry id="return"> - <internal token="return"/> - <external opt="none"/> - </entry> - </event> - <event id="AUE_smf_delete_snap" header="0" idNo="81" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - <entry id="subject"> - <internal token="subject"/> - <external opt="none"/> - </entry> - <entry id="auth_used"> - <internal token="uauth"/> - <external opt="required" type="char *"/> - <comment>authorization used</comment> - </entry> - <entry id="fmri"> - <internal token="fmri"/> - <external opt="required" type="char *"/> - <comment>name</comment> - </entry> - <entry id="name"> - <internal token="text"/> - <external opt="required" type="char *"/> - <comment>snapshot name</comment> - </entry> - <entry id="return"> - <internal token="return"/> - <external opt="none"/> - </entry> - </event> - <event id="AUE_smf_attach_snap" header="0" idNo="82" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - <entry id="subject"> - <internal token="subject"/> - <external opt="none"/> - </entry> - <entry id="auth_used"> - <internal token="uauth"/> - <external opt="required" type="char *"/> - <comment>authorization used</comment> - </entry> - <entry id="old_fmri"> - <internal token="fmri"/> - <external opt="required" type="char *"/> - <comment>old name</comment> - </entry> - <entry id="old_name"> - <internal token="text"/> - <external opt="required" type="char *"/> - <comment>old snapshot</comment> - </entry> - <entry id="new_fmri"> - <internal token="fmri"/> - <external opt="required" type="char *"/> - <comment>new name</comment> - </entry> - <entry id="new_name"> - <internal token="text"/> - <external opt="required" type="char *"/> - <comment>new snapshot</comment> - </entry> - <entry id="return"> - <internal token="return"/> - <external opt="none"/> - </entry> - </event> - - <event id="AUE_smf_annotation" header="0" idNo="83" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - <entry id="subject"> - <internal token="subject"/> - <external opt="none"/> - </entry> - <entry id="operation"> - <internal token="text"/> - <external opt="required" type="char *"/> - <comment>operation</comment> - </entry> - <entry id="file"> - <internal token="path"/> - <external opt="required" type="char *"/> - <comment>imported file</comment> - </entry> - <entry id="return"> - <internal token="return"/> - <external opt="none"/> - </entry> - </event> - - <event id="AUE_smf_create_prop" header="0" idNo="84" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - <entry id="subject"> - <internal token="subject"/> - <external opt="none"/> - </entry> - <entry id="auth_used"> - <internal token="uauth"/> - <external opt="required" type="char *"/> - <comment>authorization used</comment> - </entry> - <entry id="fmri"> - <internal token="fmri"/> - <external opt="required" type="char *"/> - <comment>name</comment> - </entry> - <entry id="type"> - <internal token="text"/> - <external opt="required" type="char *"/> - <comment>type</comment> - </entry> - <entry id="value"> - <internal token="text"/> - <external opt="optional" type="char *"/> - <comment>value</comment> - </entry> - <entry id="return"> - <internal token="return"/> - <external opt="none"/> - </entry> - </event> - - <event id="AUE_smf_change_prop" header="0" idNo="85" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - <entry id="subject"> - <internal token="subject"/> - <external opt="none"/> - </entry> - <entry id="auth_used"> - <internal token="uauth"/> - <external opt="required" type="char *"/> - <comment>authorization used</comment> - </entry> - <entry id="fmri"> - <internal token="fmri"/> - <external opt="required" type="char *"/> - <comment>name</comment> - </entry> - <entry id="type"> - <internal token="text"/> - <external opt="required" type="char *"/> - <comment>type</comment> - </entry> - <entry id="value"> - <internal token="text"/> - <external opt="optional" type="char *"/> - <comment>value</comment> - </entry> - <entry id="return"> - <internal token="return"/> - <external opt="none"/> - </entry> - </event> - <event id="AUE_smf_delete_prop" header="0" idNo="86" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - <entry id="subject"> - <internal token="subject"/> - <external opt="none"/> - </entry> - <entry id="auth_used"> - <internal token="uauth"/> - <external opt="required" type="char *"/> - <comment>authorization used</comment> - </entry> - <entry id="fmri"> - <internal token="fmri"/> - <external opt="required" type="char *"/> - <comment>name</comment> - </entry> - <entry id="return"> - <internal token="return"/> - <external opt="none"/> - </entry> - </event> - - <event id="AUE_smf_read_prop" instance_of="AUE_smf_generic" header="0" - idNo="87" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> - </event> - <!-- vscan service event; infected file detected --> - <event id="AUE_vscan_quarantine" header="0" idNo="88" omit="JNI"> + <event id="AUE_vscan_quarantine" header="0" idNo="60" omit="JNI"> <title>VSCAN: quarantine infected file</title> <program>/usr/lib/vscan/vscand</program> <see>vscand(1M), ICAP RFC 3507 (Extensions)</see> @@ -1681,7 +1311,7 @@ Use is subject to license terms. <!-- add new events here with the next higher idNo --> -<!-- Highest idNo is 88, so next is 89, then fix this comment --> +<!-- Highest idNo is 60, so next is 61, then fix this comment --> <!-- end of C Only events --> diff --git a/usr/src/lib/libbsm/common/mapfile-vers b/usr/src/lib/libbsm/common/mapfile-vers index 20a7faffe9..1efd828b2c 100644 --- a/usr/src/lib/libbsm/common/mapfile-vers +++ b/usr/src/lib/libbsm/common/mapfile-vers @@ -153,7 +153,6 @@ SUNWprivate_1.1 { adt_get_mask; adt_get_session_id; adt_get_termid; - adt_get_unique_id; adt_import_proc; adt_load_hostname; adt_load_termid; |