--- a/usr/src/Targetdirs	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/Targetdirs	Fri Jan 20 16:06:55 2006 -0800
@@ -1,13 +1,9 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,8 +18,15 @@
 #
 # CDDL HEADER END
 #
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # The list is built of owner-group combinations.  ROOT.SYS occurs twice
 # because some directories owned by root and in group sys are subdirectories
 # of directories having other owner-group attributes.
@@ -169,6 +172,8 @@
 
 ROOT.BIN= \
 	/etc/saf \
+	/etc/sma \
+	/etc/sma/snmp \
 	/lib \
 	/lib/secure \
 	/lib/svc \

--- a/usr/src/cmd/fm/fmd/common/fmd_case.c	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/fmd/common/fmd_case.c	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
  */
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -365,6 +364,10 @@
 	case FMD_CASE_SOLVED:
 		fmd_case_convict(cp);
 		nvl = fmd_case_mkevent(cp, FM_LIST_SUSPECT_CLASS);
+		(void) pthread_mutex_lock(&cip->ci_lock);
+		if (cip->ci_diag == NULL)
+			(void) nvlist_xdup(nvl, &cip->ci_diag, &fmd.d_nva);
+		(void) pthread_mutex_unlock(&cip->ci_lock);
 		(void) nvlist_lookup_string(nvl, FM_CLASS, &class);
 
 		e = fmd_event_create(FMD_EVT_PROTOCOL, FMD_HRT_NOW, nvl, class);
@@ -656,6 +659,9 @@
 	fmd_free(cip->ci_code, cip->ci_codelen);
 	fmd_buf_hash_destroy(&cip->ci_bufs);
 
+	if (cip->ci_diag != NULL)
+		nvlist_free(cip->ci_diag);
+
 	fmd_module_rele(cip->ci_mod);
 	fmd_free(cip, sizeof (fmd_case_impl_t));
 }

--- a/usr/src/cmd/fm/fmd/common/fmd_case.h	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/fmd/common/fmd_case.h	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
  */
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -74,6 +73,7 @@
 	uint_t ci_nsuspects;		/* number of ci_suspects */
 	size_t ci_nvsz;			/* packed suspect nvlist array size */
 	fmd_buf_hash_t ci_bufs;		/* hash of bufs associated with case */
+	nvlist_t *ci_diag;		/* cached event payload */
 } fmd_case_impl_t;
 
 #define	FMD_CASE_CURRENT	-1u	/* flag for current state */

--- a/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.c	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.c	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -705,6 +705,132 @@
 	return (TRUE);
 }
 
+void
+fmd_adm_caselist_case(fmd_case_t *cp, void *arg)
+{
+	fmd_case_impl_t *cip = (fmd_case_impl_t *)cp;
+	struct fmd_rpc_caselist *rcl = arg;
+	size_t uuid_len, buf_len;
+	void *p;
+
+	if (rcl->rcl_err != 0)
+		return;
+
+	/*
+	 * Lock the case and reallocate rcl_buf[] to be large enough to hold
+	 * another string, doubling it as needed.  Then copy the new string
+	 * on to the end, and increment rcl_len to indicate the used space.
+	 */
+	if (!(cip->ci_flags & FMD_CF_SOLVED))
+		return;
+
+	(void) pthread_mutex_lock(&cip->ci_lock);
+
+	uuid_len = cip->ci_uuidlen + 1;
+
+	while (rcl->rcl_len + uuid_len > rcl->rcl_buf.rcl_buf_len) {
+		if (rcl->rcl_buf.rcl_buf_len != 0)
+			buf_len = rcl->rcl_buf.rcl_buf_len * 2;
+		else
+			buf_len = 1024; /* default buffer size */
+
+		if ((p = realloc(rcl->rcl_buf.rcl_buf_val, buf_len)) != NULL) {
+			bzero((char *)p + rcl->rcl_buf.rcl_buf_len,
+			    buf_len - rcl->rcl_buf.rcl_buf_len);
+			rcl->rcl_buf.rcl_buf_val = p;
+			rcl->rcl_buf.rcl_buf_len = buf_len;
+		} else {
+			rcl->rcl_err = FMD_ADM_ERR_NOMEM;
+			break;
+		}
+	}
+
+	if (rcl->rcl_err == 0) {
+		bcopy(cip->ci_uuid, (char *)rcl->rcl_buf.rcl_buf_val +
+		    rcl->rcl_len, uuid_len);
+		rcl->rcl_len += uuid_len;
+		rcl->rcl_cnt++;
+	}
+
+	(void) pthread_mutex_unlock(&cip->ci_lock);
+}
+
+bool_t
+fmd_adm_caselist_1_svc(struct fmd_rpc_caselist *rvp, struct svc_req *req)
+{
+	rvp->rcl_buf.rcl_buf_len = 0;
+	rvp->rcl_buf.rcl_buf_val = NULL;
+	rvp->rcl_len = 0;
+	rvp->rcl_cnt = 0;
+	rvp->rcl_err = 0;
+
+	if (fmd_rpc_deny(req))
+		rvp->rcl_err = FMD_ADM_ERR_PERM;
+	else
+		fmd_case_hash_apply(fmd.d_cases, fmd_adm_caselist_case, rvp);
+
+	return (TRUE);
+}
+
+bool_t
+fmd_adm_caseinfo_1_svc(char *uuid, struct fmd_rpc_caseinfo *rvp,
+    struct svc_req *req)
+{
+	fmd_case_impl_t *cip;
+	nvlist_t *nvl;
+	int err = 0;
+
+	bzero(rvp, sizeof (struct fmd_rpc_caseinfo));
+
+	if (fmd_rpc_deny(req)) {
+		rvp->rci_err = FMD_ADM_ERR_PERM;
+		return (TRUE);
+	}
+
+	if ((cip = (fmd_case_impl_t *)fmd_case_hash_lookup(fmd.d_cases, uuid))
+	    == NULL) {
+		rvp->rci_err = FMD_ADM_ERR_CASESRCH;
+		return (TRUE);
+	}
+
+	if (!(cip->ci_flags & FMD_CF_SOLVED)) {
+		fmd_case_rele((fmd_case_t *)cip);
+		rvp->rci_err = FMD_ADM_ERR_CASESRCH;
+		return (TRUE);
+	}
+
+	/*
+	 * Avoid a race on cip->ci_diag; we can't call fmd_case_mkevent
+	 * while holding the case lock, so we do this dance instead.
+	 */
+	(void) pthread_mutex_lock(&cip->ci_lock);
+	nvl = cip->ci_diag;
+	(void) pthread_mutex_unlock(&cip->ci_lock);
+
+	if (nvl == NULL)
+		nvl = fmd_case_mkevent((fmd_case_t *)cip,
+		    FM_LIST_SUSPECT_CLASS);
+
+	(void) pthread_mutex_lock(&cip->ci_lock);
+	if (cip->ci_diag == NULL) {
+		cip->ci_diag = nvl;
+	} else if (nvl != cip->ci_diag) {
+		nvlist_free(nvl);
+		nvl = cip->ci_diag;
+	}
+	(void) pthread_mutex_unlock(&cip->ci_lock);
+
+	err = nvlist_pack(nvl, &rvp->rci_evbuf.rci_evbuf_val,
+	    &rvp->rci_evbuf.rci_evbuf_len, NV_ENCODE_XDR, 0);
+
+	if (err != 0)
+		rvp->rci_err = FMD_ADM_ERR_NOMEM;
+
+	fmd_case_rele((fmd_case_t *)cip);
+
+	return (TRUE);
+}
+
 /*ARGSUSED*/
 static void
 fmd_adm_xprtlist_one(fmd_idspace_t *ids, id_t id, void *arg)

--- a/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.x	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.x	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
  */
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -111,6 +110,18 @@
 	enum fmd_adm_error rxl_err;
 };
 
+struct fmd_rpc_caseinfo {
+	opaque rci_evbuf<>;
+	enum fmd_adm_error rci_err;
+};
+
+struct fmd_rpc_caselist {
+	opaque rcl_buf<>;
+	uint32_t rcl_len;
+	uint32_t rcl_cnt;
+	enum fmd_adm_error rcl_err;
+};
+
 program FMD_ADM {
 	version FMD_ADM_VERSION_1 {
 		struct fmd_rpc_modlist FMD_ADM_MODINFO(void) = 1;
@@ -131,6 +142,8 @@
 		int FMD_ADM_CASEREPAIR(string) = 16;
 		struct fmd_rpc_xprtlist FMD_ADM_XPRTLIST(void) = 17;
 		struct fmd_rpc_modstat FMD_ADM_XPRTSTAT(int32_t) = 18;
+		struct fmd_rpc_caselist FMD_ADM_CASELIST(void) = 19;
+		struct fmd_rpc_caseinfo FMD_ADM_CASEINFO(string) = 20;
 	} = 1;
 } = 100169;
 

--- a/usr/src/cmd/fm/modules/common/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/modules/common/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,12 +18,15 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-SUBDIRS = cpumem-retire eversholt io-retire ip-transport syslog-msgs
+SUBDIRS = cpumem-retire eversholt io-retire ip-transport snmp-trapgen	\
+	syslog-msgs
 
 include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/common/snmp-trapgen/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+MODULE = snmp-trapgen
+CLASS = common
+SRCS = snmp.c
+SMASNMPCONFS = fmd-trapgen.conf
+
+ROOTSMASNMPDIR = $(ROOT)/etc/sma/snmp
+ROOTSMASNMPCONFS = $(SMASNMPCONFS:%=$(ROOTSMASNMPDIR)/%)
+
+include ../../Makefile.plugin
+
+SNMPLIBS = -lnetsnmp -lnetsnmpagent
+lint := SNMPLIBS =
+
+CPPFLAGS += -I/usr/sfw/include
+LDFLAGS += -L/usr/sfw/lib -R/usr/sfw/lib
+LDLIBS += $(SNMPLIBS)
+
+$(ROOTSMASNMPCONFS) := FILEMODE = 0600
+
+$(ROOTSMASNMPDIR)/%: %
+	$(INS.file)
+
+install: $(ROOTSMASNMPCONFS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/common/snmp-trapgen/fmd-trapgen.conf	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# Supplemental configuration for the snmp-trapgen FMA module.  Normal
+# configuration of this module should be made via trap sink directives
+# in /etc/sma/snmp/snmpd.conf, not in this file.  See snmpd(4) and
+# snmp_config(4).
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/common/snmp-trapgen/snmp-trapgen.conf	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# snmp-trapgen agent properties:
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/common/snmp-trapgen/snmp.c	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,386 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/fm/protocol.h>
+#include <fm/fmd_api.h>
+#include <fm/fmd_snmp.h>
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+#include <locale.h>
+#include <strings.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <limits.h>
+#include <alloca.h>
+
+/*
+ * SNMP_DOMAIN defines the dgettext() parameters the agent
+ * can use to retrieve the localized format string for diagnosis messages.
+ * The format string retrieved from SNMP_DOMAIN is the default format
+ * string, but when processing each suspect list, dgettext() is also called
+ * for the domain that matches the diagcode dictname.
+ *
+ * Similarly, SNMP_URL is also checked to see if snmp_url
+ * should be overridden for each suspect list.
+ *
+ * The net effect of all this is that for a given diagcode DICT-1234-56:
+ *
+ *	- If DICT.mo defines snmp-url, it is used when filling
+ *	  in the sunFmProblemURL variable.
+ *
+ *	- Otherwise, if snmp-trapgen.conf defines a "url" property, that
+ *	  value is used.
+ *
+ *	- Otherwise, the default "http://sun.com/msg/" is used (via the
+ *	  fmd_props[] table defined in this file).
+ */
+static const char SNMP_DOMAIN[] = "FMD";
+static const char SNMP_URL[] = SNMP_URL_MSG;
+
+static struct stats {
+	fmd_stat_t bad_vers;
+	fmd_stat_t bad_code;
+	fmd_stat_t bad_uuid;
+	fmd_stat_t no_trap;
+} snmp_stats = {
+	{ "bad_vers", FMD_TYPE_UINT64, "event version is missing or invalid" },
+	{ "bad_code", FMD_TYPE_UINT64, "event code has no dictionary name" },
+	{ "bad_uuid", FMD_TYPE_UINT64, "event uuid is too long to send" },
+	{ "no_trap", FMD_TYPE_UINT64, "trap generation suppressed" }
+};
+
+static char *snmp_locdir;	/* l10n messages directory (if alternate) */
+static char *snmp_url;		/* current value of "url" property */
+static int snmp_trapall;	/* set to trap on all faults */
+
+static const char SNMP_SUPPCONF[] = "fmd-trapgen";
+
+/*ARGSUSED*/
+static void
+send_trap(fmd_hdl_t *hdl, const char *uuid, const char *code, const char *url)
+{
+	static const oid sunFmProblemTrap_oid[] = { SUNFMPROBLEMTRAP_OID };
+	const size_t sunFmProblemTrap_len = OID_LENGTH(sunFmProblemTrap_oid);
+
+	static const oid sunFmProblemUUID_oid[] =
+	    { SUNFMPROBLEMTABLE_OID, 1, SUNFMPROBLEM_COL_UUID };
+	static const oid sunFmProblemCode_oid[] =
+	    { SUNFMPROBLEMTABLE_OID, 1, SUNFMPROBLEM_COL_CODE };
+	static const oid sunFmProblemURL_oid[] =
+	    { SUNFMPROBLEMTABLE_OID, 1, SUNFMPROBLEM_COL_URL };
+
+	const size_t sunFmProblem_base_len = OID_LENGTH(sunFmProblemUUID_oid);
+
+	size_t uuid_len = strlen(uuid);
+	size_t var_len = sunFmProblem_base_len + 1 + uuid_len;
+	oid var_name[MAX_OID_LEN];
+	int i;
+
+	netsnmp_variable_list *notification_vars = NULL;
+
+	/*
+	 * The format of our trap varbinds' oids is as follows:
+	 *
+	 * +-----------------------+---+--------+----------+------+
+	 * | SUNFMPROBLEMTABLE_OID | 1 | column | uuid_len | uuid |
+	 * +-----------------------+---+--------+----------+------+
+	 *					 \---- index ----/
+	 *
+	 * A common mistake here is to send the trap with varbinds that
+	 * do not contain the index.  All the indices are the same, and
+	 * all the oids are the same length, so the only thing we need to
+	 * do for each varbind is set the table and column parts of the
+	 * variable name.
+	 */
+
+	if (var_len > MAX_OID_LEN) {
+		snmp_stats.bad_uuid.fmds_value.ui64++;
+		return;
+	}
+
+	var_name[sunFmProblem_base_len] = (oid)uuid_len;
+	for (i = 0; i < uuid_len; i++)
+		var_name[i + sunFmProblem_base_len + 1] = (oid)uuid[i];
+
+	/*
+	 * Ordinarily, we would need to add the OID of the trap itself
+	 * to the head of the variable list; this is required by SNMP v2.
+	 * However, send_enterprise_trap_vars does this for us as a part
+	 * of converting between v1 and v2 traps, so we skip directly to
+	 * the objects we're sending.
+	 */
+
+	(void) memcpy(var_name, sunFmProblemUUID_oid,
+	    sunFmProblem_base_len * sizeof (oid));
+	(void) snmp_varlist_add_variable(&notification_vars, var_name, var_len,
+	    ASN_OCTET_STR, (uchar_t *)uuid, strlen(uuid));
+	(void) memcpy(var_name, sunFmProblemCode_oid,
+	    sunFmProblem_base_len * sizeof (oid));
+	(void) snmp_varlist_add_variable(&notification_vars, var_name, var_len,
+	    ASN_OCTET_STR, (uchar_t *)code, strlen(code));
+	(void) memcpy(var_name, sunFmProblemURL_oid,
+	    sunFmProblem_base_len * sizeof (oid));
+	(void) snmp_varlist_add_variable(&notification_vars, var_name, var_len,
+	    ASN_OCTET_STR, (uchar_t *)url, strlen(url));
+
+	/*
+	 * This function is capable of sending both v1 and v2/v3 traps.
+	 * Which is sent to a specific destination is determined by the
+	 * configuration file(s).
+	 */
+	send_enterprise_trap_vars(SNMP_TRAP_ENTERPRISESPECIFIC,
+	    sunFmProblemTrap_oid[sunFmProblemTrap_len - 1],
+	    (oid *)sunFmProblemTrap_oid, sunFmProblemTrap_len - 2,
+	    notification_vars);
+
+	snmp_free_varbind(notification_vars);
+}
+
+/*ARGSUSED*/
+static void
+snmp_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
+{
+	char *uuid, *code, *dict, *url, *urlcode, *p;
+	boolean_t domsg;
+
+	uint8_t version;
+	char *olang = NULL;
+	size_t len;
+
+	if (nvlist_lookup_uint8(nvl, FM_VERSION, &version) != 0 ||
+	    version > FM_SUSPECT_VERSION) {
+		fmd_hdl_debug(hdl, "invalid event version: %u\n", version);
+		snmp_stats.bad_vers.fmds_value.ui64++;
+		return;
+	}
+
+	if (!snmp_trapall && nvlist_lookup_boolean_value(nvl,
+	    FM_SUSPECT_MESSAGE, &domsg) == 0 && !domsg) {
+		fmd_hdl_debug(hdl, "%s requested no trap\n", class);
+		snmp_stats.no_trap.fmds_value.ui64++;
+		return;
+	}
+
+	/*
+	 * Extract the uuid and diagcode dictionary from the event code.  The
+	 * dictionary name is the text preceding the first "-" in the code.
+	 */
+	(void) nvlist_lookup_string(nvl, FM_SUSPECT_UUID, &uuid);
+	(void) nvlist_lookup_string(nvl, FM_SUSPECT_DIAG_CODE, &code);
+
+	if ((p = strchr(code, '-')) == NULL || p == code) {
+		fmd_hdl_debug(hdl, "invalid diagnosis code: %s\n", code);
+		snmp_stats.bad_code.fmds_value.ui64++;
+		return;
+	}
+
+	dict = alloca((size_t)(p - code) + 1);
+	(void) strncpy(dict, code, (size_t)(p - code));
+	dict[(size_t)(p - code)] = '\0';
+
+	if (snmp_locdir != NULL)
+		(void) bindtextdomain(dict, snmp_locdir);
+
+	if ((url = dgettext(dict, SNMP_URL)) == SNMP_URL) {
+		/*
+		 * We didn't find a translation in the dictionary for the
+		 * current language.  Fall back to C and try again.
+		 */
+		olang = setlocale(LC_MESSAGES, NULL);
+		fmd_hdl_debug(hdl, "dgettext(%s, %s) in %s failed; trying C\n",
+		    dict, SNMP_URL, olang);
+		(void) setlocale(LC_MESSAGES, "C");
+		if ((url = dgettext(dict, SNMP_URL)) == SNMP_URL)
+			url = snmp_url;
+	}
+
+	/*
+	 * If the URL ends with a slash, that indicates the code should be
+	 * appended to it.  After formatting the URL, reformat the DESC
+	 * text using the URL as an snprintf argument.
+	 */
+	len = strlen(url);
+	if (url[len - 1] == '/') {
+		urlcode = alloca(len + strlen(code) + 1);
+		(void) snprintf(urlcode, INT_MAX, "%s%s", url, code);
+	} else {
+		urlcode = url;
+	}
+
+	/*
+	 * We have what we need; now send the trap.
+	 */
+	send_trap(hdl, uuid, code, urlcode);
+
+	/*
+	 * Switch back to our original language if we had to fall back to C.
+	 */
+	if (olang != NULL)
+		(void) setlocale(LC_MESSAGES, olang);
+}
+
+static int
+init_sma(void)
+{
+	int err;
+
+	/*
+	 * The only place we could possibly log is syslog, but the
+	 * full agent doesn't normally log there.  It would be confusing
+	 * if this agent did so; therefore we disable logging entirely.
+	 */
+	snmp_disable_log();
+
+	/*
+	 * Net-SNMP has a provision for reading an arbitrary number of
+	 * configuration files.  A configuration file is read if it has
+	 * had any handlers registered for it, or if it's the value in
+	 * of NETSNMP_DS_LIB_APPTYPE.  Our objective here is to read
+	 * both snmpd.conf and fmd-trapgen.conf.
+	 */
+	if ((err = netsnmp_ds_set_boolean(NETSNMP_DS_APPLICATION_ID,
+	    NETSNMP_DS_AGENT_ROLE, 0 /* MASTER_AGENT */)) != SNMPERR_SUCCESS)
+		return (err);
+
+	init_agent_read_config("snmpd");
+	if ((err = netsnmp_ds_set_string(NETSNMP_DS_LIBRARY_ID,
+	    NETSNMP_DS_LIB_APPTYPE, SNMP_SUPPCONF)) != SNMPERR_SUCCESS)
+		return (err);
+	if (register_app_config_handler("trapsink", snmpd_parse_config_trapsink,
+	    snmpd_free_trapsinks, "host [community] [port]") == NULL)
+		return (SNMPERR_MALLOC);
+	if (register_app_config_handler("trap2sink",
+	    snmpd_parse_config_trap2sink, NULL, "host [community] [port]") ==
+	    NULL)
+		return (SNMPERR_MALLOC);
+	if (register_app_config_handler("trapsess", snmpd_parse_config_trapsess,
+	    NULL, "[snmpcmdargs] host") == NULL)
+		return (SNMPERR_MALLOC);
+
+	init_traps();
+	init_snmp(SNMP_SUPPCONF);
+
+	return (SNMPERR_SUCCESS);
+}
+
+static const fmd_prop_t fmd_props[] = {
+	{ "url", FMD_TYPE_STRING, "http://sun.com/msg/" },
+	{ "trap_all", FMD_TYPE_BOOL, "false" },
+	{ NULL, 0, NULL }
+};
+
+static const fmd_hdl_ops_t fmd_ops = {
+	snmp_recv,	/* fmdo_recv */
+	NULL,		/* fmdo_timeout */
+	NULL,		/* fmdo_close */
+	NULL,		/* fmdo_stats */
+	NULL,		/* fmdo_gc */
+};
+
+static const fmd_hdl_info_t fmd_info = {
+	"SNMP Trap Generation Agent", "1.0", &fmd_ops, fmd_props
+};
+
+void
+_fmd_init(fmd_hdl_t *hdl)
+{
+	char *rootdir, *locdir;
+
+	if (fmd_hdl_register(hdl, FMD_API_VERSION, &fmd_info) != 0)
+		return; /* invalid data in configuration file */
+
+	(void) fmd_stat_create(hdl, FMD_STAT_NOALLOC, sizeof (snmp_stats) /
+	    sizeof (fmd_stat_t), (fmd_stat_t *)&snmp_stats);
+
+	if (init_sma() != SNMPERR_SUCCESS)
+		fmd_hdl_abort(hdl, "snmp-trapgen agent initialization failed");
+
+	/*
+	 * All FMA event dictionaries use msgfmt(1) message objects to produce
+	 * messages, even for the C locale.  We therefore want to use dgettext
+	 * for all message lookups, but its defined behavior in the C locale is
+	 * to return the input string.  Since our input strings are event codes
+	 * and not format strings, this doesn't help us.  We resolve this nit
+	 * by setting NLSPATH to a non-existent file: the presence of NLSPATH
+	 * is defined to force dgettext(3C) to do a full lookup even for C.
+	 */
+	if (getenv("NLSPATH") == NULL && putenv(fmd_hdl_strdup(hdl,
+	    "NLSPATH=/usr/lib/fm/fmd/fmd.cat", FMD_SLEEP)) != 0)
+		fmd_hdl_abort(hdl, "snmp-trapgen failed to set NLSPATH");
+
+	(void) setlocale(LC_MESSAGES, "");
+	fmd_hdl_debug(hdl, "locale=%s\n", setlocale(LC_MESSAGES, NULL));
+
+	/*
+	 * Cache any properties we use every time we receive an event and
+	 * subscribe to list.suspect events regardless of the .conf file.
+	 */
+	snmp_url = fmd_prop_get_string(hdl, "url");
+	snmp_trapall = fmd_prop_get_int32(hdl, "trap_all");
+
+	/*
+	 * If fmd's rootdir property is set to a non-default root, then we are
+	 * going to need to rebind the text domains we use for dgettext() as
+	 * we go.  Look up the default l10n messages directory and make
+	 * snmp_locdir be this path with fmd.rootdir prepended to it.
+	 */
+	rootdir = fmd_prop_get_string(hdl, "fmd.rootdir");
+
+	if (*rootdir != '\0' && strcmp(rootdir, "/") != 0 &&
+	    (locdir = bindtextdomain(SNMP_DOMAIN, NULL)) != NULL) {
+		size_t len = strlen(rootdir) + strlen(locdir) + 1;
+		snmp_locdir = fmd_hdl_alloc(hdl, len, FMD_SLEEP);
+		(void) snprintf(snmp_locdir, len, "%s%s", rootdir, locdir);
+		(void) bindtextdomain(SNMP_DOMAIN, snmp_locdir);
+		fmd_hdl_debug(hdl, "binding textdomain to %s\n", snmp_locdir);
+	}
+
+	fmd_prop_free_string(hdl, rootdir);
+	fmd_hdl_subscribe(hdl, FM_LIST_SUSPECT_CLASS);
+}
+
+void
+_fmd_fini(fmd_hdl_t *hdl)
+{
+	fmd_hdl_strfree(hdl, snmp_locdir);
+	fmd_prop_free_string(hdl, snmp_url);
+
+	/*
+	 * snmp_shutdown, which we would normally use here, calls free_slots,
+	 * a callback that is supposed to tear down the pkcs11 state; however,
+	 * it abuses C_Finalize, causing fmd to drop core on shutdown.  Avoid
+	 * this by shutting down the library piecemeal.
+	 */
+	snmp_store(SNMP_SUPPCONF);
+	snmp_alarm_unregister_all();
+	snmp_close_sessions();
+	shutdown_mib();
+	unregister_all_config_handlers();
+	netsnmp_ds_shutdown();
+}

--- a/usr/src/cmd/fm/schemes/Makefile.com	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/Makefile.com	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,17 +18,19 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 .KEEP_STATE:
 .SUFFIXES:
 
-include ../../../Makefile.cmd
-SCHEME :sh= basename `pwd`
+include ../../../../Makefile.cmd
+SCHEME :sh= cd ..; basename `pwd`
 
 #
 # For now, we assume a scheme is named after its directory and its source file
@@ -41,13 +42,17 @@
 OBJS = $(SRCS:%.c=%.o)
 
 ROOTPROG = $(ROOT)/usr/lib/fm/fmd/schemes/$(PROG)
-MAPFILE = ../../fmd/common/fmd_fmri.map
+ROOTPROG64 = $(ROOT)/usr/lib/fm/fmd/schemes/$(MACH64)/$(PROG)
+MAPFILE = ../../../fmd/common/fmd_fmri.map
 
 LINTFLAGS += -u
+LINTFLAGS64 += -u
 LINTFILES = $(SRCS:%.c=%.ln)
 
 CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
 CFLAGS += -G $(XREGSFLAG)
-CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D$(MACH) -I.
+CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
+CFLAGS64 += -G $(XREGSFLAG)
+CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D$(MACH) -I..
 LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZDEFS) $(ZIGNORE) -M$(MAPFILE)
 LDLIBS += -lnvpair -lc

--- a/usr/src/cmd/fm/schemes/Makefile.targ	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/Makefile.targ	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,13 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 all: $(PROG)
 
@@ -35,7 +36,7 @@
 	$(CTFMERGE) -L VERSION -o $@ $(OBJS)
 	$(POST_PROCESS_SO)
 
-%.o: %.c
+%.o: ../%.c
 	$(COMPILE.c) $<
 	$(CTFCONVERT_O)
 
@@ -45,7 +46,7 @@
 clobber: clean
 	$(RM) $(PROG)
 
-%.ln: %.c
+%.ln: ../%.c
 	$(LINT.c) -c $<
 
 lint: $(LINTFILES)
@@ -59,10 +60,14 @@
 $(ROOT)/usr/lib/fm/fmd: $(ROOT)/usr/lib/fm
 	$(INS.dir)
 
-$(ROOT)/usr/lib/fm/fmd/%: $(ROOT)/usr/lib/fm/fmd
+$(ROOT)/usr/lib/fm/fmd/schemes: $(ROOT)/usr/lib/fm/fmd
+	$(INS.dir)
+
+$(ROOT)/usr/lib/fm/fmd/schemes/$(MACH64): $(ROOT)/usr/lib/fm/fmd/schemes
 	$(INS.dir)
 
 $(ROOTPROG): $$(@D) $(PROG)
 	$(RM) $@; $(INS) -s -m 0555 -f $(@D) $(PROG)
 
-install: $(ROOTPROG)
+$(ROOTPROG64): $$(@D) $(PROG)
+	$(RM) $@; $(INS) -s -m 0555 -f $(@D) $(PROG)

--- a/usr/src/cmd/fm/schemes/cpu/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/cpu/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -20,33 +20,15 @@
 #
 
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-include ../Makefile.com
-
-SCHEME_COMMON = ../common
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-sparc_SRCS =	\
-	cpu_mdesc.c \
-	mdesc_devinit.c
-
-SRCS =	\
-	cpu.c \
-	$($(MACH)_SRCS)
+include ../../../Makefile.cmd
 
-sparc_LDLIBS = -L$(ROOTLIB)/fm -lmdesc
-LDLIBS += -lkstat $($(MACH)_LDLIBS)
-
-LDFLAGS += -R/usr/lib/fm
-
-include ../Makefile.targ
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
-%.o: $(SCHEME_COMMON)/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
-%.ln: $(SCHEME_COMMON)/%.c
-	$(LINT.c) -erroff=E_BAD_PTR_CAST_ALIGN -v -c $<
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/cpu/Makefile.com	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,41 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+
+SCHEME_COMMON = ../../common
+
+sparc_SRCS =	\
+	cpu_mdesc.c \
+	mdesc_devinit.c
+
+SRCS =	\
+	cpu.c \
+	$($(MACH)_SRCS)
+
+LDLIBS += -lkstat

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/cpu/Makefile.targ	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.targ
+
+%.o: $(SCHEME_COMMON)/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
+%.ln: $(SCHEME_COMMON)/%.c
+	$(LINT.c) -erroff=E_BAD_PTR_CAST_ALIGN -v -c $<

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/cpu/amd64/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+LDFLAGS += -R/usr/lib/fm/$(MACH64)
+
+include ../Makefile.targ
+
+install: all $(ROOTPROG64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/cpu/i386/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+
+LDFLAGS += -R/usr/lib/fm
+
+include ../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/cpu/sparc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+
+LDLIBS += -L$(ROOTLIB)/fm -lmdesc
+LDFLAGS += -R/usr/lib/fm
+
+include ../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/cpu/sparcv9/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+LDLIBS += -L$(ROOTLIB)/fm/$(MACH64) -lmdesc
+LDFLAGS += -R/usr/lib/fm/$(MACH64)
+
+include ../Makefile.targ
+
+install: all $(ROOTPROG64)

--- a/usr/src/cmd/fm/schemes/dev/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/dev/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -20,13 +20,15 @@
 #
 
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-include ../Makefile.com
+include ../../../Makefile.cmd
 
-LDLIBS +=-ldevinfo
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
-include ../Makefile.targ
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/dev/Makefile.com	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+
+LDLIBS += -ldevinfo

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/dev/amd64/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/dev/i386/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/dev/sparc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/dev/sparcv9/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- a/usr/src/cmd/fm/schemes/fmd/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/fmd/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,17 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../../Makefile.cmd
 
-include ../Makefile.com
-include ../Makefile.targ
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/fmd/amd64/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/fmd/i386/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/fmd/sparc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/fmd/sparcv9/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- a/usr/src/cmd/fm/schemes/hc/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/hc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,17 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../../Makefile.cmd
 
-include ../Makefile.com
-include ../Makefile.targ
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/hc/amd64/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/hc/i386/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/hc/sparc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/hc/sparcv9/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- a/usr/src/cmd/fm/schemes/legacy-hc/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/legacy-hc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,17 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../../Makefile.cmd
 
-include ../Makefile.com
-include ../Makefile.targ
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/legacy-hc/amd64/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/legacy-hc/i386/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/legacy-hc/sparc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/legacy-hc/sparcv9/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- a/usr/src/cmd/fm/schemes/mem/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/mem/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,33 +18,17 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-include ../Makefile.com
-
-SCHEME_COMMON = ../common
+include ../../../Makefile.cmd
 
-SRCS = \
-	mdesc_devinit.c \
-	mem.c \
-	mem_disc.c \
-	mem_read.c \
-	mem_unum.c \
-	mem_util.c
-
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
-LDLIBS += -L$(ROOTLIB)/fm -lmdesc -lrt
-LDFLAGS += -R/usr/lib/fm
-
-include ../Makefile.targ
-
-%.o: $(SCHEME_COMMON)/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
-%.ln: $(SCHEME_COMMON)/%.c
-	$(LINT.c) -erroff=E_BAD_PTR_CAST_ALIGN -v -c $<
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/mem/Makefile.com	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,41 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+
+SCHEME_COMMON = ../../common
+
+SRCS =	\
+	mdesc_devinit.c \
+	mem.c \
+	mem_disc.c \
+	mem_read.c \
+	mem_unum.c \
+	mem_util.c
+
+LDLIBS += -lrt

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/mem/Makefile.targ	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.targ
+
+%.o: $(SCHEME_COMMON)/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
+%.ln: $(SCHEME_COMMON)/%.c
+	$(LINT.c) -erroff=E_BAD_PTR_CAST_ALIGN -v -c $<

--- a/usr/src/cmd/fm/schemes/mem/mem.c	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/mem/mem.c	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -296,14 +296,15 @@
 fmd_fmri_expand(nvlist_t *nvl)
 {
 	char *unum, **serids;
-	uint_t nserids;
+	uint_t nnvlserids;
+	size_t nserids;
 	int rc;
 
 	if (mem_fmri_get_unum(nvl, &unum) < 0)
 		return (fmd_fmri_set_errno(EINVAL));
 
 	if ((rc = nvlist_lookup_string_array(nvl, FM_FMRI_MEM_SERIAL_ID,
-	    &serids, &nserids)) == 0)
+	    &serids, &nnvlserids)) == 0)
 		return (0); /* fmri is already expanded */
 	else if (rc != ENOENT)
 		return (fmd_fmri_set_errno(EINVAL));
@@ -347,7 +348,8 @@
 fmd_fmri_present(nvlist_t *nvl)
 {
 	char *unum, **nvlserids, **serids;
-	uint_t nnvlserids, nserids;
+	uint_t nnvlserids;
+	size_t nserids;
 	uint64_t memconfig;
 	int rc;
 

--- a/usr/src/cmd/fm/schemes/mem/mem_unum.c	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/mem/mem_unum.c	Fri Jan 20 16:06:55 2006 -0800
@@ -264,7 +264,7 @@
 unum_contains_bypat(const char *erunum, const char *eeunum)
 {
 	char **ernms, **eenms;
-	uint_t nernms, neenms;
+	size_t nernms, neenms;
 	int i, j, rv = 1;
 
 	if (mem_unum_burst(erunum, &ernms, &nernms) < 0)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/mem/sparc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+
+LDLIBS += -L$(ROOTLIB)/fm -lmdesc
+LDFLAGS += -R/usr/lib/fm
+
+include ../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/mem/sparcv9/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+LDLIBS += -L$(ROOTLIB)/fm/$(MACH64) -lmdesc
+LDFLAGS += -R/usr/lib/fm/$(MACH64)
+
+include ../Makefile.targ
+
+install: all $(ROOTPROG64)

--- a/usr/src/cmd/fm/schemes/mod/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/mod/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,17 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../../Makefile.cmd
 
-include ../Makefile.com
-include ../Makefile.targ
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/mod/amd64/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/mod/i386/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/mod/sparc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/mod/sparcv9/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- a/usr/src/cmd/fm/schemes/pkg/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/cmd/fm/schemes/pkg/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,17 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../../Makefile.cmd
 
-include ../Makefile.com
-include ../Makefile.targ
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/pkg/amd64/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/pkg/i386/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/pkg/sparc/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include ../../Makefile.targ
+
+install: all $(ROOTPROG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/schemes/pkg/sparcv9/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+include $(SRC)/Makefile.master.64
+include ../../Makefile.targ
+
+install: all $(ROOTPROG64)

--- a/usr/src/lib/fm/Makefile	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/lib/fm/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,14 +18,17 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 sparc_SUBDIRS = libmdesc
 
-SUBDIRS = libdiagcode libfmd_adm libfmd_log libtopo $($(MACH)_SUBDIRS)
+SUBDIRS = libdiagcode libfmd_adm libfmd_log libfmd_snmp libtopo \
+	$($(MACH)_SUBDIRS)
 
 include ./Makefile.subdirs

--- a/usr/src/lib/fm/libfmd_adm/Makefile.com	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/lib/fm/libfmd_adm/Makefile.com	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,12 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY = libfmd_adm.a
 VERS = .1
@@ -44,7 +44,7 @@
 CPPFLAGS += -I../common -I.
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
-LDLIBS += -lnsl -lc
+LDLIBS += -lnvpair -lnsl -lc
 
 LINTFLAGS = -msux
 LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)

--- a/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
  */
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -31,11 +30,16 @@
 #include <stdlib.h>
 #include <netdir.h>
 #include <errno.h>
+#include <alloca.h>
+#include <locale.h>
+#include <uuid/uuid.h>
 
+#include <sys/fm/protocol.h>
 #include <fmd_adm_impl.h>
 #include <fmd_rpc_adm.h>
 
 static const uint_t _fmd_adm_bufsize = 128 * 1024;
+static const char _url_fallback[] = "http://sun.com/msg/";
 
 fmd_adm_t *
 fmd_adm_open(const char *host, uint32_t prog, int version)
@@ -392,6 +396,29 @@
 	return (0);
 }
 
+int
+fmd_adm_rsrc_count(fmd_adm_t *ap, int all, uint32_t *rcp)
+{
+	struct fmd_rpc_rsrclist rrl;
+
+	if (rcp == NULL)
+		return (fmd_adm_set_errno(ap, EINVAL));
+
+	bzero(&rrl, sizeof (rrl)); /* tell xdr to allocate memory for us */
+
+	if (fmd_adm_rsrclist_1(all, &rrl, ap->adm_clnt) != RPC_SUCCESS)
+		return (fmd_adm_set_errno(ap, EPROTO));
+
+	if (rrl.rrl_err != 0) {
+		xdr_free(xdr_fmd_rpc_rsrclist, (char *)&rrl);
+		return (fmd_adm_set_svcerr(ap, rrl.rrl_err));
+	}
+
+	*rcp = rrl.rrl_cnt;
+	xdr_free(xdr_fmd_rpc_rsrclist, (char *)&rrl);
+	return (0);
+}
+
 static int
 fmd_adm_rsrc_cmp(const void *lp, const void *rp)
 {
@@ -533,6 +560,162 @@
 }
 
 static int
+fmd_adm_case_cmp(const void *lp, const void *rp)
+{
+	return (strcmp(*(char **)lp, *(char **)rp));
+}
+
+static int
+fmd_adm_case_one(fmd_adm_caseinfo_t *acp, const char *url_token,
+    fmd_adm_case_f *func, void *arg)
+{
+	char *p, *urlcode, *dict, *olang;
+	const char *url;
+	size_t	len;
+
+	if ((p = strchr(acp->aci_code, '-')) == NULL ||
+	    p == acp->aci_code) {
+		acp->aci_url = NULL;
+	} else {
+		dict = alloca((size_t)(p - acp->aci_code) + 1);
+		(void) strncpy(dict, acp->aci_code,
+		    (size_t)(p - acp->aci_code));
+		dict[(size_t)(p - acp->aci_code)] = '\0';
+
+		/*
+		 * If we're given a token to use in looking up the URL, try
+		 * to use it.  Otherwise, or if we don't find it that way,
+		 * use the fallback.
+		 */
+		if (url_token == NULL) {
+			url = _url_fallback;
+		} else if ((url = dgettext(dict, url_token)) == url_token) {
+			/*
+			 * We didn't find a translation in the
+			 * dictionary for the current language.  Fall
+			 * back to C and try again.
+			 */
+			olang = setlocale(LC_MESSAGES, NULL);
+			(void) setlocale(LC_MESSAGES, "C");
+			if ((url = dgettext(dict, url_token)) == url_token)
+				url = _url_fallback;
+			(void) setlocale(LC_MESSAGES, olang);
+		}
+		len = strlen(url);
+		if (url[len - 1] == '/') {
+			len += strlen(acp->aci_code) + 1;
+			urlcode = alloca(len);
+			(void) snprintf(urlcode, len, "%s%s", url,
+			    acp->aci_code);
+		} else {
+			urlcode = (char *)url;
+		}
+		acp->aci_url = urlcode;
+	}
+
+	return (func(acp, arg));
+}
+
+/*
+ * Our approach to cases is the same as for resources: we first obtain a
+ * list of UUIDs, sort them, then obtain the case information for each.
+ */
+int
+fmd_adm_case_iter(fmd_adm_t *ap, const char *url_token, fmd_adm_case_f *func,
+    void *arg)
+{
+	struct fmd_rpc_caselist rcl;
+	struct fmd_rpc_caseinfo rci;
+	fmd_adm_caseinfo_t aci;
+	char **uuids, *p;
+	int i, rv;
+
+	bzero(&rcl, sizeof (rcl)); /* tell xdr to allocate memory for us */
+
+	if (fmd_adm_caselist_1(&rcl, ap->adm_clnt) != RPC_SUCCESS)
+		return (fmd_adm_set_errno(ap, EPROTO));
+
+	if (rcl.rcl_err != 0) {
+		xdr_free(xdr_fmd_rpc_caselist, (char *)&rcl);
+		return (fmd_adm_set_svcerr(ap, rcl.rcl_err));
+	}
+
+	if ((uuids = malloc(sizeof (char *) * rcl.rcl_cnt)) == NULL) {
+		xdr_free(xdr_fmd_rpc_caselist, (char *)&rcl);
+		return (fmd_adm_set_errno(ap, EAGAIN));
+	}
+
+	p = rcl.rcl_buf.rcl_buf_val;
+
+	for (i = 0; i < rcl.rcl_cnt; i++, p += strlen(p) + 1)
+		uuids[i] = p;
+
+	qsort(uuids, rcl.rcl_cnt, sizeof (char *), fmd_adm_case_cmp);
+
+	for (i = 0; i < rcl.rcl_cnt; i++) {
+		bzero(&rci, sizeof (rci));
+
+		if (fmd_adm_caseinfo_1(uuids[i], &rci, ap->adm_clnt)
+		    != RPC_SUCCESS) {
+			free(uuids);
+			xdr_free(xdr_fmd_rpc_caselist, (char *)&rcl);
+			return (fmd_adm_set_errno(ap, EPROTO));
+		}
+
+		if (rci.rci_err != 0 && rci.rci_err != FMD_ADM_ERR_CASESRCH) {
+			xdr_free(xdr_fmd_rpc_caseinfo, (char *)&rci);
+			free(uuids);
+			xdr_free(xdr_fmd_rpc_caselist, (char *)&rcl);
+			return (fmd_adm_set_svcerr(ap, rci.rci_err));
+		}
+
+		if (rci.rci_err == FMD_ADM_ERR_CASESRCH) {
+			xdr_free(xdr_fmd_rpc_caseinfo, (char *)&rci);
+			continue;
+		}
+
+		bzero(&aci, sizeof (aci));
+
+		if ((rv = nvlist_unpack(rci.rci_evbuf.rci_evbuf_val,
+		    rci.rci_evbuf.rci_evbuf_len, &aci.aci_event, 0)) != 0) {
+			xdr_free(xdr_fmd_rpc_caseinfo, (char *)&rci);
+			free(uuids);
+			xdr_free(xdr_fmd_rpc_caselist, (char *)&rcl);
+			return (fmd_adm_set_errno(ap, rv));
+		}
+
+		if ((rv = nvlist_lookup_string(aci.aci_event, FM_SUSPECT_UUID,
+		    (char **)&aci.aci_uuid)) != 0) {
+			xdr_free(xdr_fmd_rpc_caseinfo, (char *)&rci);
+			free(uuids);
+			xdr_free(xdr_fmd_rpc_caselist, (char *)&rcl);
+			nvlist_free(aci.aci_event);
+			return (fmd_adm_set_errno(ap, rv));
+		}
+		if ((rv = nvlist_lookup_string(aci.aci_event,
+		    FM_SUSPECT_DIAG_CODE, (char **)&aci.aci_code)) != 0) {
+			xdr_free(xdr_fmd_rpc_caseinfo, (char *)&rci);
+			free(uuids);
+			xdr_free(xdr_fmd_rpc_caselist, (char *)&rcl);
+			nvlist_free(aci.aci_event);
+			return (fmd_adm_set_errno(ap, rv));
+		}
+
+		rv = fmd_adm_case_one(&aci, url_token, func, arg);
+
+		xdr_free(xdr_fmd_rpc_caseinfo, (char *)&rci);
+		nvlist_free(aci.aci_event);
+
+		if (rv != 0)
+			break;
+	}
+
+	free(uuids);
+	xdr_free(xdr_fmd_rpc_caselist, (char *)&rcl);
+	return (0);
+}
+
+static int
 fmd_adm_serd_cmp(const void *lp, const void *rp)
 {
 	return (strcmp((*(struct fmd_rpc_serdinfo **)lp)->rsi_name,

--- a/usr/src/lib/fm/libfmd_adm/common/fmd_adm.h	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/lib/fm/libfmd_adm/common/fmd_adm.h	Fri Jan 20 16:06:55 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -91,12 +91,23 @@
 #define	FMD_ADM_RSRC_UNUSABLE	0x2	/* resource is unusable */
 #define	FMD_ADM_RSRC_INVISIBLE	0x4	/* resource is not directly visible */
 
+typedef struct fmd_adm_caseinfo {
+	const char *aci_uuid;
+	const char *aci_code;
+	const char *aci_url;
+	nvlist_t *aci_event;
+} fmd_adm_caseinfo_t;
+
 typedef int fmd_adm_rsrc_f(const fmd_adm_rsrcinfo_t *, void *);
+typedef int fmd_adm_case_f(const fmd_adm_caseinfo_t *, void *);
 
+extern int fmd_adm_rsrc_count(fmd_adm_t *, int, uint32_t *);
 extern int fmd_adm_rsrc_iter(fmd_adm_t *, int, fmd_adm_rsrc_f *, void *);
 extern int fmd_adm_rsrc_flush(fmd_adm_t *, const char *);
 extern int fmd_adm_rsrc_repair(fmd_adm_t *, const char *);
 extern int fmd_adm_case_repair(fmd_adm_t *, const char *);
+extern int fmd_adm_case_iter(fmd_adm_t *, const char *, fmd_adm_case_f *,
+    void *);
 
 typedef struct fmd_adm_serdinfo {
 	const char *asi_name;		/* name of serd engine */

--- a/usr/src/lib/fm/libfmd_adm/spec/fmd_adm.spec	Fri Jan 20 11:54:53 2006 -0800
+++ b/usr/src/lib/fm/libfmd_adm/spec/fmd_adm.spec	Fri Jan 20 16:06:55 2006 -0800
@@ -1,13 +1,9 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,12 +18,22 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 function	fmd_adm_case_repair
 version		SUNWprivate
 end
 
+function	fmd_adm_case_iter
+version		SUNWprivate
+end
+
 function        fmd_adm_close
 version         SUNWprivate
 end
@@ -68,6 +74,10 @@
 version		SUNWprivate
 end
 
+function	fmd_adm_rsrc_count
+version		SUNWprivate
+end
+
 function	fmd_adm_rsrc_flush
 version		SUNWprivate
 end

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/fm/libfmd_snmp/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,78 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.lib
+include ../Makefile.lib
+
+FMHDRS = fmd_snmp.h
+HDRDIR = common
+
+SUBDIRS = $(MACH) 
+$(BUILD64)SUBDIRS += $(MACH64)
+
+MIBFILES = SUN-FM-MIB.mib
+
+ROOTSMAMIBDIR = $(ROOT)/etc/sma/snmp/mibs
+ROOTMIBS = $(MIBFILES:%=$(ROOTSMAMIBDIR)/%)
+
+$(ROOTMIBS) := FILEMODE = 0644
+$(ROOTSMAMIBDIR) := DIRMODE = 0755
+
+all := TARGET = all
+clean := TARGET = clean
+clobber := TARGET = clobber
+install := TARGET = install
+lint := TARGET = lint
+
+.KEEP_STATE:
+
+all clean clobber: spec .WAIT $(SUBDIRS)
+
+install: install_h install_mibs spec .WAIT $(SUBDIRS)
+
+lint:
+
+install_h: $(ROOTFMHDRS)
+
+install_mibs: $(ROOTSMAMIBDIR) $(ROOTMIBS)
+
+check: $(CHECKHDRS)
+
+spec $(SUBDIRS): FRC
+	@cd $@; pwd; $(MAKE) $(TARGET)
+
+$(ROOTSMAMIBDIR):
+	$(INS.dir)
+
+$(ROOTSMAMIBDIR)/%: mibs/%
+	$(INS.file)
+
+FRC:
+
+include ../../Makefile.targ
+include ../Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/fm/libfmd_snmp/Makefile.com	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,84 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+
+LIBRARY = libfmd_snmp.a
+VERS = .1
+
+LIBSRCS = \
+	debug_subr.c	\
+	init.c		\
+	module.c	\
+	problem.c	\
+	resource.c	\
+	scheme.c
+
+OBJECTS = $(LIBSRCS:%.c=%.o)
+
+include ../../../Makefile.lib
+include ../../Makefile.lib
+
+SRCS = $(LIBSRCS:%.c=../common/%.c)
+LIBS = $(DYNLIB) $(LINTLIB)
+
+SRCDIR = ../common
+SPECMAPFILE = $(MAPDIR)/mapfile
+
+CPPFLAGS += -I../common -I. -I/usr/sfw/include
+$(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
+CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
+CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
+
+LDLIBS += $(MACH_LDLIBS)
+LDLIBS += -lfmd_adm -luutil -lnvpair
+LDLIBS += -L$(SFWLIBDIR) -lnetsnmp -lnetsnmphelpers -lnetsnmpagent -lc
+DYNFLAGS += -R$(SFWLIBDIR)
+
+LINTFLAGS = -msux
+LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)
+
+$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
+$(LINTLIB) := LINTFLAGS = -nsvx
+$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9)
+
+.KEEP_STATE:
+
+all: $(LIBS)
+
+lint: $(LINTLIB) lintcheck
+
+pics/%.o: ../$(MACH)/%.c
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
+
+%.o: ../common/%.c
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
+
+include ../../../Makefile.targ
+include ../../Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/fm/libfmd_snmp/amd64/Makefile	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+MAPDIR = ../spec/amd64
+MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64)
+
+include ../Makefile.com
+include ../../../Makefile.lib.64
+
+DYNFLAGS += -R/usr/lib/fm/$(MACH64)
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/fm/libfmd_snmp/common/debug_subr.c	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,60 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+#include <stdarg.h>
+
+void
+sunFm_vpanic(const char *format, va_list ap)
+{
+	snmp_vlog(LOG_ERR, format, ap);
+#ifdef DEBUG
+	abort();
+	exit(1);
+#endif
+}
+
+void
+sunFm_panic(const char *format, ...)
+{
+	va_list	ap;
+
+	va_start(ap, format);
+	sunFm_vpanic(format, ap);
+	va_end(ap);
+}
+
+int
+sunFm_assert(const char *expr, const char *file, int line)
+{
+	sunFm_panic("\"%s\", line %d: assertion failed: %s\n", file, line,
+	    expr);
+	return (0);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/fm/libfmd_snmp/common/fmd_snmp.h	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,114 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _SUNFM_H
+#define	_SUNFM_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+ * These values are derived from, and must remain consistent with, the
+ * MIB definitions.
+ */
+#define	MODNAME_STR	"sunFM"
+#define	SUNFM_OID	1, 3, 6, 1, 4, 1, 42, 2, 195, 1
+
+#define	SUNFMPROBLEMTABLE_OID		SUNFM_OID, 1
+
+#define	SUNFMPROBLEM_COL_UUIDINDEX	1
+#define	SUNFMPROBLEM_COL_UUID		2
+#define	SUNFMPROBLEM_COL_CODE		3
+#define	SUNFMPROBLEM_COL_URL		4
+#define	SUNFMPROBLEM_COL_DIAGENGINE	5
+#define	SUNFMPROBLEM_COL_DIAGTIME	6
+#define	SUNFMPROBLEM_COL_SUSPECTCOUNT	7
+
+#define	SUNFMPROBLEM_COLMIN		SUNFMPROBLEM_COL_UUID
+#define	SUNFMPROBLEM_COLMAX		SUNFMPROBLEM_COL_SUSPECTCOUNT
+
+#define	SUNFMFAULTEVENTTABLE_OID	SUNFM_OID, 2
+
+#define	SUNFMFAULTEVENT_COL_UUIDINDEX	1
+#define	SUNFMFAULTEVENT_COL_INDEX	2
+#define	SUNFMFAULTEVENT_COL_PROBLEMUUID	3
+#define	SUNFMFAULTEVENT_COL_CLASS	4
+#define	SUNFMFAULTEVENT_COL_CERTAINTY	5
+#define	SUNFMFAULTEVENT_COL_ASRU	6
+#define	SUNFMFAULTEVENT_COL_FRU		7
+#define	SUNFMFAULTEVENT_COL_RESOURCE	8
+
+#define	SUNFMFAULTEVENT_COLMIN		SUNFMFAULTEVENT_COL_PROBLEMUUID
+#define	SUNFMFAULTEVENT_COLMAX		SUNFMFAULTEVENT_COL_RESOURCE
+
+#define	SUNFMMODULETABLE_OID		SUNFM_OID, 3
+
+#define	SUNFMMODULE_COL_INDEX		1
+#define	SUNFMMODULE_COL_NAME		2
+#define	SUNFMMODULE_COL_VERSION		3
+#define	SUNFMMODULE_COL_STATUS		4
+#define	SUNFMMODULE_COL_DESCRIPTION	5
+
+#define	SUNFMMODULE_COLMIN		SUNFMMODULE_COL_NAME
+#define	SUNFMMODULE_COLMAX		SUNFMMODULE_COL_DESCRIPTION
+
+#define	SUNFMMODULE_STATE_OTHER		1
+#define	SUNFMMODULE_STATE_ACTIVE	2
+#define	SUNFMMODULE_STATE_FAILED	3
+
+#define	SUNFMRESOURCECOUNT_OID		SUNFM_OID, 4
+
+#define	SUNFMRESOURCETABLE_OID		SUNFM_OID, 5
+
+#define	SUNFMRESOURCE_COL_INDEX		1
+#define	SUNFMRESOURCE_COL_FMRI		2
+#define	SUNFMRESOURCE_COL_STATUS	3
+#define	SUNFMRESOURCE_COL_DIAGNOSISUUID	4
+
+#define	SUNFMRESOURCE_COLMIN		SUNFMRESOURCE_COL_FMRI
+#define	SUNFMRESOURCE_COLMAX		SUNFMRESOURCE_COL_DIAGNOSISUUID
+
+#define	SUNFMRESOURCE_STATE_OTHER	1
+#define	SUNFMRESOURCE_STATE_OK		2
+#define	SUNFMRESOURCE_STATE_DEGRADED	3
+#define	SUNFMRESOURCE_STATE_UNKNOWN	4
+#define	SUNFMRESOURCE_STATE_FAULTED	5
+
+#define	SUNFMTRAPS_OID			SUNFM_OID, 7, 0
+#define	SUNFMPROBLEMTRAP_OID		SUNFMTRAPS_OID, 1
+
+#define	SNMP_URL_MSG	"snmp-url"
+
+extern int	init_sunFM(void);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _SUNFM_H */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/fm/libfmd_snmp/common/init.c	Fri Jan 20 16:06:55 2006 -0800
@@ -0,0 +1,86 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <fm/fmd_snmp.h>
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+#include "sunFM_impl.h"
+#include "module.h"
+#include "resource.h"
+#include "problem.h"
+
+static const sunFm_table_t sun_fm_tables[] = {
+	TABLE_REG(sunFmModuleTable),
+	TABLE_REG(sunFmResourceTable),
+	TABLE_REG(sunFmProblemTable),
+	TABLE_REG(sunFmFaultEventTable),
+	TABLE_NULL
+};
+
+/*
+ * This is our entry point for initialization by the agent, which
+ * (for reasons unknown) ignores the return value.  The name is fixed
+ * by the agent API.
+ */
+int
+init_sunFM(void)
+{
+	int			max_err = MIB_REGISTERED_OK;
+	const sunFm_table_t	*table;
+
+	for (table = sun_fm_tables; table->t_name != NULL; table++) {
+		int err = table->t_init();
+
+		switch (err) {
+		case MIB_REGISTERED_OK:
+			DEBUGMSGTL((MODNAME_STR, "registered table %s\n",
+			    table->t_name));
+			break;
+		case MIB_DUPLICATE_REGISTRATION:
+			(void) snmp_log(LOG_ERR, MODNAME_STR
+			    ": table %s initialization failed: duplicate "
+			    "registration\n", table->t_name);
+			break;
+		case MIB_REGISTRATION_FAILED:
+			(void) snmp_log(LOG_ERR, MODNAME_STR
+			    ": table %s initialization failed: agent "
+			    "registration failure\n", table->t_name);
+			break;
+		default:
+			snmp_log(LOG_ERR, MODNAME_STR
+			    ": table %s initialization failed: "
+			    "unknown reason\n", table->t_name);
+		}
+
+		if (err > max_err)
+			max_err = err;
+	}
+
+	return (max_err);
+}