LSARC/2006/150 SEA EOF and DMI EOF and Removal

6270167 gcc and cmd/agents don't get along - and g++ won't even play
6375120 EOF DMI

--HG--
rename : usr/src/cmd/agents/schemas/agents/enterprises.oid => deleted_files/usr/src/cmd/agents/schemas/agents/enterprises.oid
rename : usr/src/cmd/initpkg/init.d/init.dmi => deleted_files/usr/src/cmd/initpkg/init.d/init.dmi
rename : usr/src/pkgdefs/SUNWsadmi/Makefile => deleted_files/usr/src/pkgdefs/SUNWsadmi/Makefile
rename : usr/src/pkgdefs/SUNWsadmi/pkginfo.tmpl => deleted_files/usr/src/pkgdefs/SUNWsadmi/pkginfo.tmpl
rename : usr/src/pkgdefs/SUNWsadmi/preinstall => deleted_files/usr/src/pkgdefs/SUNWsadmi/preinstall
rename : usr/src/pkgdefs/SUNWsadmi/preremove => deleted_files/usr/src/pkgdefs/SUNWsadmi/preremove
rename : usr/src/pkgdefs/SUNWsadmi/prototype_com => deleted_files/usr/src/pkgdefs/SUNWsadmi/prototype_com
rename : usr/src/pkgdefs/SUNWsadmi/prototype_i386 => deleted_files/usr/src/pkgdefs/SUNWsadmi/prototype_i386
rename : usr/src/pkgdefs/SUNWsadmi/prototype_sparc => deleted_files/usr/src/pkgdefs/SUNWsadmi/prototype_sparc

30 files changed, 161 insertions, 146 deletions

diff --git a/usr/src/cmd/agents/schemas/agents/enterprises.oid b/deleted_files/usr/src/cmd/agents/schemas/agents/enterprises.oid
index 3b765fa9f2..3b765fa9f2 100644
--- a/usr/src/cmd/agents/schemas/agents/enterprises.oid
+++ b/deleted_files/usr/src/cmd/agents/schemas/agents/enterprises.oid
diff --git a/usr/src/cmd/initpkg/init.d/init.dmi b/deleted_files/usr/src/cmd/initpkg/init.d/init.dmi
index 32c0f4f177..32c0f4f177 100644
--- a/usr/src/cmd/initpkg/init.d/init.dmi
+++ b/deleted_files/usr/src/cmd/initpkg/init.d/init.dmi
diff --git a/usr/src/pkgdefs/SUNWsadmi/Makefile b/deleted_files/usr/src/pkgdefs/SUNWsadmi/Makefile
index 745c71203b..745c71203b 100644
--- a/usr/src/pkgdefs/SUNWsadmi/Makefile
+++ b/deleted_files/usr/src/pkgdefs/SUNWsadmi/Makefile
diff --git a/usr/src/pkgdefs/SUNWsadmi/pkginfo.tmpl b/deleted_files/usr/src/pkgdefs/SUNWsadmi/pkginfo.tmpl
index 9b388554a3..9b388554a3 100644
--- a/usr/src/pkgdefs/SUNWsadmi/pkginfo.tmpl
+++ b/deleted_files/usr/src/pkgdefs/SUNWsadmi/pkginfo.tmpl
diff --git a/usr/src/pkgdefs/SUNWsadmi/preinstall b/deleted_files/usr/src/pkgdefs/SUNWsadmi/preinstall
index b7e7755f1f..b7e7755f1f 100644
--- a/usr/src/pkgdefs/SUNWsadmi/preinstall
+++ b/deleted_files/usr/src/pkgdefs/SUNWsadmi/preinstall
diff --git a/usr/src/pkgdefs/SUNWsadmi/preremove b/deleted_files/usr/src/pkgdefs/SUNWsadmi/preremove
index 3f8bd464ff..3f8bd464ff 100644
--- a/usr/src/pkgdefs/SUNWsadmi/preremove
+++ b/deleted_files/usr/src/pkgdefs/SUNWsadmi/preremove
diff --git a/usr/src/pkgdefs/SUNWsadmi/prototype_com b/deleted_files/usr/src/pkgdefs/SUNWsadmi/prototype_com
index 503c67739d..503c67739d 100644
--- a/usr/src/pkgdefs/SUNWsadmi/prototype_com
+++ b/deleted_files/usr/src/pkgdefs/SUNWsadmi/prototype_com
diff --git a/usr/src/pkgdefs/SUNWsadmi/prototype_i386 b/deleted_files/usr/src/pkgdefs/SUNWsadmi/prototype_i386
index 520543c44b..520543c44b 100644
--- a/usr/src/pkgdefs/SUNWsadmi/prototype_i386
+++ b/deleted_files/usr/src/pkgdefs/SUNWsadmi/prototype_i386
diff --git a/usr/src/pkgdefs/SUNWsadmi/prototype_sparc b/deleted_files/usr/src/pkgdefs/SUNWsadmi/prototype_sparc
index cd89be2393..cd89be2393 100644
--- a/usr/src/pkgdefs/SUNWsadmi/prototype_sparc
+++ b/deleted_files/usr/src/pkgdefs/SUNWsadmi/prototype_sparc
diff --git a/usr/src/cmd/abi/appcert/etc/etc.scoped.in b/usr/src/cmd/abi/appcert/etc/etc.scoped.in
index af4bc3d60e..b4b3456766 100644
--- a/usr/src/cmd/abi/appcert/etc/etc.scoped.in
+++ b/usr/src/cmd/abi/appcert/etc/etc.scoped.in
@@ -1,15 +1,14 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 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.
@@ -1748,9 +1747,6 @@ SCOPED_SYMBOL|SunOS_5.8|libdevinfo.so.1|devfs_iscbdriver
 SCOPED_SYMBOL|SunOS_5.8|libdevinfo.so.1|devinfo_prop_get_int
 SCOPED_SYMBOL|SunOS_5.8|libdevinfo.so.1|local_addr
 SCOPED_SYMBOL|SunOS_5.10|libdevinfo.so.1|di_devlink_synchronize_db
-SCOPED_SYMBOL|SunOS_5.8|libdmi.so.1|trace_on
-SCOPED_SYMBOL|SunOS_5.8|libdmi.so.1|get_debug_flag
-SCOPED_SYMBOL|SunOS_5.8|libdmi.so.1|set_debug_flag
 SCOPED_SYMBOL|SunOS_5.8|libprint.so.2|dynamic_function
 SCOPED_SYMBOL|SunOS_5.8|libprint.so.2|etc_get_list
 SCOPED_SYMBOL|SunOS_5.8|libprint.so.2|etc_get_name
diff --git a/usr/src/cmd/abi/appcert/etc/etc.tweaks.in b/usr/src/cmd/abi/appcert/etc/etc.tweaks.in
index e6c84705ab..e9fe2770d4 100644
--- a/usr/src/cmd/abi/appcert/etc/etc.tweaks.in
+++ b/usr/src/cmd/abi/appcert/etc/etc.tweaks.in
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 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.
@@ -90,11 +89,6 @@ MODEL_TWEAK|/usr/lib/libc.so.1|i386,amd64|ntohl|public
 MODEL_TWEAK|/usr/lib/libc.so.1|i386,amd64|ntohs|public
 MODEL_TWEAK|/usr/lib/libc.so.1|*|__trans_lower|public
 MODEL_TWEAK|/usr/lib/libc.so.1|*|__trans_upper|public
-MODEL_TWEAK|/usr/lib/libdmi.so.1|*|dmi_error|public
-MODEL_TWEAK|/usr/lib/libdmi.so.1|*|freeDmiString|public
-MODEL_TWEAK|/usr/lib/libdmi.so.1|*|newDmiString|public
-MODEL_TWEAK|/usr/lib/libdmi.so.1|*|printDmiDataUnion|public
-MODEL_TWEAK|/usr/lib/libdmi.so.1|*|printDmiString|public
 MODEL_TWEAK|/usr/lib/libresolv.so.2|*|res_mkupdrec|public
 MODEL_TWEAK|/usr/lib/libresolv.so.2|*|__p_rr|private
 MODEL_TWEAK|/usr/dt/lib/libDtSvc.so.1|*|DtActionInvoke|public
diff --git a/usr/src/cmd/agents/Makefile b/usr/src/cmd/agents/Makefile
index b1ef20e22a..30b6408aa3 100644
--- a/usr/src/cmd/agents/Makefile
+++ b/usr/src/cmd/agents/Makefile
@@ -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 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"
 
 # cmd/agents/Makefile
 
@@ -65,7 +65,6 @@ TARG_SYS:sh =                           \
 ROOTDIR	: sh=echo ${ROOTDIR:-"`pwd`"}
 PKGLOC	: sh=echo ${PKGLOC:-'${ROOTDIR}/PACKAGES.`uname -p`'}
 
-$(CLOSED_BUILD)DMI= $(CLOSED)/cmd/agents/dmi2.0
 $(CLOSED_BUILD)AGENTS= $(CLOSED)/cmd/agents/agents
 
 all	:=		TARGET = all
@@ -74,7 +73,7 @@ install	:=		TARGET = install
 lint	:=		TARGET = lint
 realclobber :=		TARGET = realclobber
 
-SUBDIRS = snmp $(DMI) $(AGENTS)
+SUBDIRS = snmp $(AGENTS)
 
 #
 # all
@@ -92,18 +91,10 @@ OWNER=		root
 GROUP=		sys
 ROOTVAR=	$(ROOT)/var
 
-ROOTDIRS=	$(ROOTETC)/dmi \
-		$(ROOTETC)/dmi/ciagent \
-		$(ROOTETC)/dmi/conf \
-		$(ROOTETC)/snmp \
+ROOTDIRS=	$(ROOTETC)/snmp \
 		$(ROOTETC)/snmp/conf \
-		$(ROOTLIB)/dmi \
 		$(ROOTLIB)/snmp \
 		$(ROOTBIN) \
-		$(ROOTVAR)/dmi \
-		$(ROOTVAR)/dmi/db \
-		$(ROOTVAR)/dmi/map \
-		$(ROOTVAR)/dmi/mif \
 		$(ROOTVAR)/snmp \
 		$(ROOTVAR)/snmp/mib
 
@@ -130,11 +121,4 @@ lint:  $(SUBDIRS)
 
 realclobber: $(SUBDIRS)
 
-package:
-	cd ../../pkgdefs; pwd; $(MAKE) awk_pkginfo
-	cd ../../pkgdefs/SUNWmibii; pwd; $(MAKE) install
-	cd ../../pkgdefs/SUNWsacom; pwd; $(MAKE) install
-	cd ../../pkgdefs/SUNWsadmi; pwd; $(MAKE) install
-	cd ../../pkgdefs/SUNWsasnm; pwd; $(MAKE) install
-
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/cmd/agents/snmp/parser/backend.c b/usr/src/cmd/agents/snmp/parser/backend.c
index 44f6a93ecb..63410081b1 100644
--- a/usr/src/cmd/agents/snmp/parser/backend.c
+++ b/usr/src/cmd/agents/snmp/parser/backend.c
@@ -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 2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -224,9 +224,8 @@ void get_subid_of_node(struct tree *t, Subid *subids, int *len)
 
 /*************************************************************************/
 
-void main(argc, argv)
-	int argc;
-	char *argv[];
+int
+main(int argc, char *argv[])
 {
 	struct node *nodes = NULL;
 	int i;
@@ -347,7 +346,7 @@ void main(argc, argv)
 	output_appl_c(root);
 	output_trap_c(root);
 
-	exit(0);
+	return (0);
 }
 
 
diff --git a/usr/src/cmd/agents/snmp/snmprelayd/config.y b/usr/src/cmd/agents/snmp/snmprelayd/config.y
index 3ca6582b0c..8780678c96 100644
--- a/usr/src/cmd/agents/snmp/snmprelayd/config.y
+++ b/usr/src/cmd/agents/snmp/snmprelayd/config.y
@@ -3,9 +3,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,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * 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.
  */
 
@@ -2128,6 +2129,7 @@ static void trace_macros()
 int yyerror(char *s)
 {
 	error("%s at line %d: %s", s, yylineno, yytext);
+	return (0);
 }
 
 
diff --git a/usr/src/cmd/agents/snmp/snmprelayd/dispatcher.c b/usr/src/cmd/agents/snmp/snmprelayd/dispatcher.c
index 244e702d16..21641346df 100644
--- a/usr/src/cmd/agents/snmp/snmprelayd/dispatcher.c
+++ b/usr/src/cmd/agents/snmp/snmprelayd/dispatcher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -438,10 +438,8 @@ static void print_usage()
 	exit(1);
 }
 
-
-main(argc, argv)
-	int argc;
-	char *argv[];
+int
+main(int argc, char *argv[])
 {
 	int arg;
 	int Fails ; 
@@ -715,4 +713,6 @@ main(argc, argv)
 	}
 
 	dispatcher_loop();
+
+	return (0);
 }
diff --git a/usr/src/cmd/agents/snmp/snmprelayd/enterprises.oid b/usr/src/cmd/agents/snmp/snmprelayd/enterprises.oid
index fe364bfdf9..4bb2e4b111 100644
--- a/usr/src/cmd/agents/snmp/snmprelayd/enterprises.oid
+++ b/usr/src/cmd/agents/snmp/snmprelayd/enterprises.oid
@@ -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,7 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 1994 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"
 #
@@ -27,6 +29,7 @@
 #
 # enterprises.oid - SMI Network Management Private Enterprise Codes
 #
+
 # This file is used by the SunNet Manager build_oid(1) utility as
 # input in building an Object Identifier (OID) database for use by
 # SunNet Manager.
diff --git a/usr/src/cmd/agents/snmp/snmprelayd/res.c b/usr/src/cmd/agents/snmp/snmprelayd/res.c
index 86a8126130..d891a8b6c1 100644
--- a/usr/src/cmd/agents/snmp/snmprelayd/res.c
+++ b/usr/src/cmd/agents/snmp/snmprelayd/res.c
@@ -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 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -325,7 +325,7 @@ int switch_to_user_id(char *user_name)
 {
   struct passwd *sp;
 
-  if(user_name == NULL) return;
+  if(user_name == NULL) return (FALSE);
   sp = getpwnam(user_name);
   if(sp != NULL && sp->pw_uid != 0){
 	setgid(sp->pw_gid);
diff --git a/usr/src/cmd/agents/snmp/trapsend/trapsend.c b/usr/src/cmd/agents/snmp/trapsend/trapsend.c
index a68152a426..115fd1813d 100644
--- a/usr/src/cmd/agents/snmp/trapsend/trapsend.c
+++ b/usr/src/cmd/agents/snmp/trapsend/trapsend.c
@@ -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 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -57,9 +57,8 @@
 
 static int is_number (char *buf); 
 
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char *argv[])
 {
     extern char *optarg;
 	extern int optind;
diff --git a/usr/src/cmd/initpkg/init.d/Makefile b/usr/src/cmd/initpkg/init.d/Makefile
index 0d7415a4f4..1f9e90d9b8 100644
--- a/usr/src/cmd/initpkg/init.d/Makefile
+++ b/usr/src/cmd/initpkg/init.d/Makefile
@@ -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.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -40,7 +40,6 @@ PROG=		\
 	devlinks	\
 	dhcp		\
 	drvconfig	\
-	init.dmi	\
 	init.snmpdx	\
 	ldap.client	\
 	mkdtab		\
diff --git a/usr/src/cmd/initpkg/rc0.d/mk.rc0.d.sh b/usr/src/cmd/initpkg/rc0.d/mk.rc0.d.sh
index fab51c00ea..6f1ac0473b 100644
--- a/usr/src/cmd/initpkg/rc0.d/mk.rc0.d.sh
+++ b/usr/src/cmd/initpkg/rc0.d/mk.rc0.d.sh
@@ -3,9 +3,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.
@@ -25,7 +24,7 @@
 
 
 #
-# 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"
@@ -33,7 +32,7 @@
 
 COMMON_STOPLST="27boot.server"
 
-INIT_STOPLST="07snmpdx 07dmi"
+INIT_STOPLST="07snmpdx"
 
 INSDIR=${ROOT}/etc/rc0.d
 
diff --git a/usr/src/cmd/initpkg/rc1.d/mk.rc1.d.sh b/usr/src/cmd/initpkg/rc1.d/mk.rc1.d.sh
index a78ef43532..0f6188e6d2 100644
--- a/usr/src/cmd/initpkg/rc1.d/mk.rc1.d.sh
+++ b/usr/src/cmd/initpkg/rc1.d/mk.rc1.d.sh
@@ -3,9 +3,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.
@@ -25,7 +24,7 @@
 
 
 #
-# 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"
@@ -33,7 +32,7 @@
 
 COMMON_STOPLST="27boot.server"
 
-INIT_STOPLST="07snmpdx 07dmi"
+INIT_STOPLST="07snmpdx"
 
 INSDIR=${ROOT}/etc/rc1.d
 
diff --git a/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh b/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
index ef5bfcb9d1..de66cc1174 100644
--- a/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
+++ b/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
@@ -3,9 +3,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.
@@ -25,7 +24,7 @@
 
 
 #
-# 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"
@@ -40,7 +39,7 @@ COMMON_STARTLST="\
 
 STOPLST="27boot.server"
 
-INIT_STOPLST="07snmpdx 07dmi"
+INIT_STOPLST="07snmpdx"
 
 INSDIR=${ROOT}/etc/rc2.d
 
diff --git a/usr/src/cmd/initpkg/rc3.d/mk.rc3.d.sh b/usr/src/cmd/initpkg/rc3.d/mk.rc3.d.sh
index 3216228684..22193635ce 100644
--- a/usr/src/cmd/initpkg/rc3.d/mk.rc3.d.sh
+++ b/usr/src/cmd/initpkg/rc3.d/mk.rc3.d.sh
@@ -3,9 +3,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.
@@ -25,14 +24,14 @@
 
 
 #
-# 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"
 
 STARTLST="16boot.server"
 
-INIT_STARTLST="76snmpdx 77dmi"
+INIT_STARTLST="76snmpdx"
 
 INSDIR=${ROOT}/etc/rc3.d
 
diff --git a/usr/src/cmd/initpkg/rcS.d/mk.rcS.d.sh b/usr/src/cmd/initpkg/rcS.d/mk.rcS.d.sh
index c9228276fe..5fff1cf855 100644
--- a/usr/src/cmd/initpkg/rcS.d/mk.rcS.d.sh
+++ b/usr/src/cmd/initpkg/rcS.d/mk.rcS.d.sh
@@ -3,9 +3,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 @@
 # 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.
 #
 #	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
@@ -35,7 +34,7 @@ COMMON_STARTLST=""
 COMMON_STOPLST="\
 27boot.server"
 
-INIT_STOPLST="07snmpdx 07dmi"
+INIT_STOPLST="07snmpdx"
 
 INSDIR=${ROOT}/etc/rcS.d
 
diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile
index 2819ae29bc..9e0ad9b9b0 100644
--- a/usr/src/pkgdefs/Makefile
+++ b/usr/src/pkgdefs/Makefile
@@ -285,7 +285,6 @@ COMMON_SUBDIRS= \
 	SUNWrsg \
 	SUNWrsgk \
 	SUNWsacom \
-	SUNWsadmi \
 	SUNWsasnm \
 	SUNWsbp2 \
 	SUNWscpr  \
diff --git a/usr/src/pkgdefs/SUNWsacom/Makefile b/usr/src/pkgdefs/SUNWsacom/Makefile
index cef9dc14c3..59e40a0f91 100644
--- a/usr/src/pkgdefs/SUNWsacom/Makefile
+++ b/usr/src/pkgdefs/SUNWsacom/Makefile
@@ -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 1997, 2002, 2003 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
@@ -35,7 +35,6 @@ ACTION_all=grep SUNWter depend > /dev/null || \
 	( chmod 666 depend; \
 	echo "P SUNWmibii     Solstice Enterprise Agents SNMP daemon" >> depend; \
 	echo "P SUNWsasnm     Solstice Enterprise Agents Simple Network Management Protocol" >> depend; \
-	echo "P SUNWsadmi     Solstice Enterprise Agents Desktop Management Interface" >> depend; \
 	echo "P SUNWlibC      SPARCompilers Bundled libC" >> depend; \
 	chmod 444 depend )
 
diff --git a/usr/src/pkgdefs/SUNWsacom/prototype_com b/usr/src/pkgdefs/SUNWsacom/prototype_com
index fe0049b9c7..011d25c088 100644
--- a/usr/src/pkgdefs/SUNWsacom/prototype_com
+++ b/usr/src/pkgdefs/SUNWsacom/prototype_com
@@ -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.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 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"
 #
 # Solstice Enterprise Agents files for root file system
 #
@@ -48,7 +47,6 @@ i preinstall
 i postinstall
 i space
 i i.initd
-i i.preserve
 #
 d none etc 0755 root sys
 d none etc/init.d 0755 root sys
@@ -61,16 +59,7 @@ d none etc/rc3.d 0755 root sys
 d none etc/snmp 0755 root sys
 d none etc/snmp/conf 0755 root sys
 #
-d none etc/dmi 0755 root sys
-d none etc/dmi/conf 0755 root sys
-d none etc/dmi/ciagent 0755 root sys
-#
 d none var 0755 root sys
-d none var/dmi 0755 root sys
-d none var/dmi/db 0755 root sys
-d none var/dmi/map 0755 root sys
-d none var/dmi/mif 0755 root sys
-#
 d none var/snmp 0755 root sys
 d none var/snmp/mib 0755 root sys
 #
@@ -88,25 +77,9 @@ v none etc/snmp/conf/snmpdx.acl 600 root sys
 v none etc/snmp/conf/snmpd.conf 600 root sys
 v none etc/snmp/conf/mibiisa.reg 644 root sys
 #
-e initd etc/init.d/init.dmi 744 root sys
-l initd etc/rc3.d/S77dmi=../../etc/init.d/init.dmi
-l initd etc/rc2.d/K07dmi=../../etc/init.d/init.dmi
-l initd etc/rc1.d/K07dmi=../../etc/init.d/init.dmi
-l initd etc/rcS.d/K07dmi=../../etc/init.d/init.dmi
-l initd etc/rc0.d/K07dmi=../../etc/init.d/init.dmi
-#
-f none etc/dmi/conf/snmpXdmid.conf 644 root sys
-e preserve etc/dmi/conf/dmispd.conf 644 root sys
-#
 f none etc/snmp/conf/enterprises.oid 644 root sys
 v none etc/snmp/conf/mibiisa.rsrc- 0644 root sys
 #
-f none var/dmi/map/test.map 644 root sys
-#
-f none var/dmi/mif/sp.mif 644 root sys
-#
 f none var/snmp/mib/sun.mib 0644 root sys
 f none var/snmp/mib/snmpdx.mib 644 root sys
 #
-f none etc/dmi/ciagent/ciinvoke 755 root sys
-#
diff --git a/usr/src/tools/abi/etc/exceptions b/usr/src/tools/abi/etc/exceptions
index 586d9e50b4..dba67be402 100644
--- a/usr/src/tools/abi/etc/exceptions
+++ b/usr/src/tools/abi/etc/exceptions
@@ -228,7 +228,6 @@ PSARC 2004/619: RULE W2: usr/lib/amd64/watchmalloc.so.1
 4480868: RULE W3: lib/libdhcpagent.so.1
 4480868: RULE W3: usr/lib/libdhcpsvc.so.1
 4480868: RULE W3: lib/libdhcputil.so.1
-4480868: RULE W3: usr/lib/libdmi.so.1
 4480868: RULE W3: lib/libdoor.so.1
 4480868: RULE W3: lib/libinetutil.so.1
 4480868: RULE W3: usr/lib/liblm.so.1
@@ -280,7 +279,6 @@ PSARC 2004/619: RULE W3: lib/amd64/libcmd.so.1
 PSARC 2004/619: RULE W3: lib/amd64/libctf.so.1
 4480868: RULE W3: lib/sparcv9/libdevice.so.1
 PSARC 2004/619: RULE W3: lib/amd64/libdevice.so.1
-4480868: RULE W3: usr/lib/sparcv9/libdmi.so.1
 4480868: RULE W3: lib/sparcv9/libdoor.so.1
 PSARC 2004/619: RULE W3: lib/amd64/libdoor.so.1
 4480868: RULE W3: lib/sparcv9/libinetutil.so.1
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh
index 2e88cadc5c..7cb208156a 100644
--- a/usr/src/tools/scripts/bfu.sh
+++ b/usr/src/tools/scripts/bfu.sh
@@ -2836,6 +2836,75 @@ remove_eof_face() {
 	rm -rf $usr/vmsys
 }
 
+remove_eof_dmi() {
+	# Packages to remove
+	typeset -r dmi_pkgs='SUNWsadmi'
+	typeset -r pkgroot=${rootprefix:+-R $rootprefix}
+	typeset pkg
+
+	printf 'Removing DMI... '
+
+	#
+	# First, attempt to remove the packages cleanly if possible.
+	#
+	for pkg in $dmi_pkgs
+	do
+		if pkginfo $pkgroot -q $pkg; then
+			printf ' %s' $pkg
+			pkgrm $pkgroot -n $pkg >/dev/null 2>&1
+		fi
+	done
+	printf '\n'
+
+	#
+	# In case that didn't work, do it manually.
+	# Remove DMI from $rootprefix/var/sadm/install/contents
+	#
+	for pkg in $dmi_pkgs
+	do
+		if [ -d $rootprefix/var/sadm/pkg/$pkg ]; then
+			rm -rf $rootprefix/var/sadm/pkg/$pkg
+			grep -vw $pkg $rootprefix/var/sadm/install/contents > \
+			    /tmp/contents.$$
+			cp /tmp/contents.$$ $rootprefix/var/sadm/install/contents.$$
+			rm /tmp/contents.$$
+		fi
+	done
+
+	#
+	# Cleanup any remaining DMI files, symlinks, and directories.
+	#
+	rm -rf $usr/lib/dmi
+	rm -rf $rootprefix/var/dmi
+	rm -rf $rootprefix/etc/dmi
+	rm -f $usr/lib/libdmi.so
+	rm -f $usr/lib/libdmici.so
+	rm -f $usr/lib/libdmimi.so
+	rm -f $usr/lib/libdmi.so.1
+	rm -f $usr/lib/libdmici.so.1
+	rm -f $usr/lib/libdmimi.so.1
+	rm -f $usr/lib/sparcv9/libdmi.so
+	rm -f $usr/lib/sparcv9/libdmici.so
+	rm -f $usr/lib/sparcv9/libdmimi.so
+	rm -f $usr/lib/sparcv9/libdmi.so.1
+	rm -f $usr/lib/sparcv9/libdmici.so.1
+	rm -f $usr/lib/sparcv9/libdmimi.so.1
+	rm -f $usr/lib/amd64/libdmi.so
+	rm -f $usr/lib/amd64/libdmici.so
+	rm -f $usr/lib/amd64/libdmimi.so
+	rm -f $usr/lib/amd64/libdmi.so.1
+	rm -f $usr/lib/amd64/libdmici.so.1
+	rm -f $usr/lib/amd64/libdmimi.so.1
+	rm -f $usr/sbin/dmi_cmd
+	rm -f $usr/sbin/dmiget
+	rm -f $rootprefix/etc/init.d/init.dmi
+	rm -f $rootprefix/etc/rc0.d/K07dmi
+	rm -f $rootprefix/etc/rc1.d/K07dmi
+	rm -f $rootprefix/etc/rc2.d/K07dmi
+	rm -f $rootprefix/etc/rcS.d/K07dmi
+	rm -f $rootprefix/etc/rc3.d/S77dmi
+}
+
 remove_properties() {
 
 	#
@@ -4848,6 +4917,15 @@ mondo_loop() {
 	fi
 
 	#
+	# Remove DMI
+	#
+	if [ -d $usr/lib/dmi -o \
+	     -d $rootprefix/etc/dmi -o \
+	     -d $rootprefix/var/dmi ]; then
+	        remove_eof_dmi
+	fi
+
+	#
 	# Remove ASET
 	#
 	if [ -d $usr/aset ]; then
diff --git a/usr/src/tools/scripts/check_rtime.pl b/usr/src/tools/scripts/check_rtime.pl
index b42931584e..e39b453fa6 100644
--- a/usr/src/tools/scripts/check_rtime.pl
+++ b/usr/src/tools/scripts/check_rtime.pl
@@ -88,9 +88,6 @@ $SkipFiles = qr{ ^(?:
 	libm\.so\.2 |			# temporary; delivered by compiler group
 	geniconvtbl\.so |		# 4384329
 	libssagent\.so\.1 |		# 4328854
-	libdmi\.so\.1 |			#  "  "
-	libdmici\.so\.1 |		#  "  "
-	libdmimi\.so\.1 |		#  "  "
 	libpsvcplugin_psr\.so\.1 |	# 4385799
 	libpsvcpolicy_psr\.so\.1 |	#  "  "
 	libpsvcpolicy\.so\.1 |		#  "  "