PSARC/2009/617 Software Events Notification Parameters CLI

PSARC/2009/618 snmp-notify: SNMP Notification Daemon for Software Events
PSARC/2009/619 smtp-notify: Email Notification Daemon for Software Events
PSARC/2010/225 fmd for non-global Solaris zones
PSARC/2010/226 Solaris Instance UUID
PSARC/2010/227 nvlist_nvflag(3NVPAIR)
PSARC/2010/228 libfmevent additions
PSARC/2010/257 sysevent_evc_setpropnvl and sysevent_evc_getpropnvl
PSARC/2010/265 FMRI and FMA Event Stabilty, 'ireport' category 1 event class, and the 'sw' FMRI scheme
PSARC/2010/278 FMA/SMF integration: instance state transitions
PSARC/2010/279 Modelling panics within FMA
PSARC/2010/290 logadm.conf upgrade
6392476 fmdump needs to pretty-print
6393375 userland ereport/ireport event generation interfaces
6445732 Add email notification agent for FMA and software events
6804168 RFE: Allow an efficient means to monitor SMF services status changes
6866661 scf_values_destroy(3SCF) will segfault if is passed NULL
6884709 Add snmp notification agent for FMA and software events
6884712 Add private interface to tap into libfmd_msg macro expansion capabilities
6897919 fmd to run in a non-global zone
6897937 fmd use of non-private doors is not safe
6900081 add a UUID to Solaris kernel image for use in crashdump identification
6914884 model panic events as a defect diagnosis in FMA
6944862 fmd_case_open_uuid, fmd_case_uuisresolved, fmd_nvl_create_defect
6944866 log legacy sysevents in fmd
6944867 enumerate svc scheme in topo
6944868 software-diagnosis and software-response fmd modules
6944870 model SMF maintenance state as a defect diagnosis in FMA
6944876 savecore runs in foreground for systems with zfs root and dedicated dump
6965796 Implement notification parameters for SMF state transitions and FMA events
6968287 SUN-FM-MIB.mib needs to be updated to reflect Oracle information
6972331 logadm.conf upgrade PSARC/2010/290

1 files changed, 8 insertions, 5 deletions

diff --git a/usr/src/cmd/fm/scripts/dictck.pl b/usr/src/cmd/fm/scripts/dictck.pl
index f0a3d144d9..cfb07d3d46 100644
--- a/usr/src/cmd/fm/scripts/dictck.pl
+++ b/usr/src/cmd/fm/scripts/dictck.pl
@@ -19,10 +19,7 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # dictck -- Sanity check a .dict file and optionally the corresponding .po file
@@ -56,6 +53,11 @@ $SIG{HUP} = $SIG{INT} = $SIG{TERM} = $SIG{__DIE__} = sub {
 };
 
 #
+# Category 1 event classes
+#
+my @cat1ev = qw(fault defect upset ereport list ireport);
+
+#
 # usage -- print a usage message and exit
 #
 sub usage {
@@ -182,10 +184,11 @@ sub dodict {
 
 		# check for duplicate or unexpected keys
 		my %keys;
+		my $cat1pat = join('|', @cat1ev);
 		foreach my $e (split(/\s/, $lhs)) {
 			die "$name:$line: unknown event type \"$e\"\n"
 			    unless $e =~
-			    /^(fault|defect|upset|ereport|list)\..*[^.]$/;
+			    /^($cat1pat)\..*[^.]$/;
 			die "$name:$line: key repeated: \"$e\"\n"
 			    if defined($keys{$e});
 			$keys{$e} = 1;