PSARC 2002/356 in.tnamed (IEN-116) EOL

4698338 remove obsolete in.tnamed (IEN-116) protocol support

--HG--
rename : usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c => deleted_files/usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c
rename : usr/src/cmd/cmd-inet/usr.sbin/tname.xml => deleted_files/usr/src/cmd/cmd-inet/usr.sbin/tname.xml
rename : usr/src/pkgdefs/SUNWtnamd/Makefile => deleted_files/usr/src/pkgdefs/SUNWtnamd/Makefile
rename : usr/src/pkgdefs/SUNWtnamd/depend => deleted_files/usr/src/pkgdefs/SUNWtnamd/depend
rename : usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl => deleted_files/usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl
rename : usr/src/pkgdefs/SUNWtnamd/prototype_com => deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_com
rename : usr/src/pkgdefs/SUNWtnamd/prototype_i386 => deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_i386
rename : usr/src/pkgdefs/SUNWtnamd/prototype_sparc => deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_sparc
rename : usr/src/pkgdefs/SUNWtnamr/Makefile => deleted_files/usr/src/pkgdefs/SUNWtnamr/Makefile
rename : usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl => deleted_files/usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl
rename : usr/src/pkgdefs/SUNWtnamr/prototype_com => deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_com
rename : usr/src/pkgdefs/SUNWtnamr/prototype_i386 => deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_i386
rename : usr/src/pkgdefs/SUNWtnamr/prototype_sparc => deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_sparc

17 files changed, 17 insertions, 881 deletions

diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
index 431d407e70..2d14d3751e 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,12 +34,12 @@ XMODPROG=	wanbootutil
 
 PROG=		6to4relay arp gettable if_mpadm ikeadm ikecert \
 		in.comsat in.fingerd in.rarpd in.rexecd in.rlogind \
-		in.rshd in.rwhod in.telnetd in.tftpd in.tnamed ipaddrsel \
+		in.rshd in.rwhod in.telnetd in.tftpd ipaddrsel \
 		ipsecalgs ipsecconf ipseckey ndd $(SYNCPROG) $(DHCPPROG) \
 		$(XMODPROG)
 
 MANIFEST=	rarp.xml telnet.xml comsat.xml finger.xml \
-		login.xml shell.xml rexec.xml tname.xml
+		login.xml shell.xml rexec.xml 
 
 ROOTFS_PROG=	hostconfig route soconfig
 SBINLINKS=	hostconfig route
@@ -49,11 +49,11 @@ AUDITPROG=	in.rexecd in.rlogind in.rshd in.telnetd
 PAMPROG=	in.rexecd in.rlogind in.rshd in.telnetd
 SOCKETPROG=	6to4relay arp gettable hostconfig if_mpadm in.comsat \
 		in.fingerd in.rarpd in.rexecd in.rlogind in.rshd \
-		in.rwhod in.telnetd in.tftpd in.tnamed ipaddrsel \
+		in.rwhod in.telnetd in.tftpd ipaddrsel \
 		ipsecalgs ipsecconf ipseckey route
 NSLPROG=	6to4relay arp gettable hostconfig ikeadm in.comsat in.rarpd \
 		in.rexecd in.rlogind in.rshd in.rwhod in.telnetd \
-		in.tftpd in.tnamed ipaddrsel ipsecalgs ipsecconf ipseckey route
+		in.tftpd ipaddrsel ipsecalgs ipsecconf ipseckey route
 CMDPROG=	in.telnetd
 IPSECUTILPROG=	ikeadm ipsecalgs ipsecconf ipseckey
 K5PROGS=	in.telnetd in.rlogind in.rshd
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c b/usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c
deleted file mode 100644
index 229f33bf8f..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * 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.
- *
- * 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 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
- * Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
- * All Rights Reserved.
- */
-
-/*
- * University Copyright- Copyright (c) 1982, 1986, 1988
- * The Regents of the University of California.
- * All Rights Reserved.
- *
- * University Acknowledgment- Portions of this document are derived from
- * software developed by the University of California, Berkeley, and its
- * contributors.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * This program implements a UDP basic name server as specified in IEN116
- * The extended name server functionality is NOT implemented here (yet).
- * This is generally used in conjunction with MIT's PC/IP software.
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-#ifdef SYSV
-#define	bzero(s, n)	memset((s), 0, (n))
-#define	bcopy(a, b, c)	memcpy((b), (a), (c))
-#endif /* SYSV */
-
-/*
- * These command codes come from IEN116
- */
-#define	NAMECODE	1
-#define	ADDRESSCODE	2
-#define	ERRORCODE	3
-/*
- * These error codes are used to qualify ERRORCODE
- */
-#define	UNDEFINEDERROR	0
-#define	NOTFOUNDERROR	1
-#define	SYNTAXERROR	2
-#define	BUFLEN 2000
-static void handler(int sig);
-
-int
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	int s;
-	struct sockaddr_in client;
-	int length;
-	socklen_t clientlength;
-	register struct hostent	*hp;
-	char hostname[BUFLEN];
-	char iobuf[BUFLEN];
-	register char *buffer = iobuf;
-	register int replylength;
-	int request;
-	struct in_addr x;
-
-	if (argc > 1) {
-		/* the daemon is run by hand and never exits */
-		struct servent temp;
-		register struct servent *sp;
-		register struct protoent *pp;
-		struct sockaddr_in server;
-
-		if ((sp = getservbyname("name", "udp")) == NULL) {
-			fprintf(stderr, "in.tnamed: UDP name server not in ");
-			fprintf(stderr, "/etc/services\n");
-			sp = &temp;
-			sp->s_port = htons(42);
-		}
-		if ((pp = getprotobyname("udp")) == NULL) {
-			fprintf(stderr, "in.tnamed: UDP protocol not in ");
-			fprintf(stderr, "/etc/protocols\n");
-			exit(1);
-		}
-		if ((s = socket(AF_INET, SOCK_DGRAM, pp->p_proto)) < 0) {
-			perror("in.tnamed: socket error");
-			exit(1);
-		}
-		bzero((char *)&server, sizeof (server));
-		server.sin_family = AF_INET;
-		server.sin_port = sp->s_port;
-		if (bind(s, (struct sockaddr *)&server, sizeof (server)) != 0) {
-			perror("in.tnamed: bind error");
-			exit(1);
-		}
-		fprintf(stderr, "in.tnamed: UDP name server running\n");
-	} else {
-		/* daemon forked by inetd and is short lived */
-		struct itimerval value, ovalue;
-
-		signal(SIGALRM, handler);
-		value.it_value.tv_sec = 5 * 60;
-		value.it_value.tv_usec = value.it_interval.tv_usec = 0;
-		setitimer(ITIMER_REAL, &value, &ovalue);
-		s = 0;  /* by inetd conventions */
-	}
-
-	for (;;) {
-
-		clientlength = (socklen_t)sizeof (client);
-		length = recvfrom(s, buffer, BUFLEN, 0,
-		    (struct sockaddr *)&client, &clientlength);
-		if (length < 0) {
-			perror("in.tnamed: recvfrom error.Try in.tnamed -v ?");
-			continue;
-		}
-
-		request = buffer[0];
-		length = buffer[1];
-		replylength = length + 2;  /* reply is appended to request */
-		if (length < sizeof (hostname)) {
-			strncpy(hostname, &buffer[2], length);
-			hostname[length] = 0;
-		} else {
-			hostname[0] = 0;
-		}
-
-		if (request != NAMECODE) {
-			fprintf(stderr, "in.tnamed: bad request from %s\n",
-			    inet_ntoa(client.sin_addr));
-			buffer[replylength++] = ERRORCODE;
-			buffer[replylength++] = 3;  /* no error msg yet */
-			buffer[replylength++] = SYNTAXERROR;
-			fprintf(stderr,
-			    "in.tnamed: request (%d) not NAMECODE\n", request);
-			sleep(5);  /* pause before saying something negative */
-			goto sendreply;
-		}
-
-		if (hostname[0] == '!') {
-			/*
-			 * !host!net name format is not implemented yet,
-			 * only host alone.
-			 */
-			fprintf(stderr, "in.tnamed: %s ",
-			    inet_ntoa(client.sin_addr));
-			fprintf(stderr, "using !net!host format name ");
-			fprintf(stderr, "request\n");
-
-			buffer[replylength++] = ERRORCODE;
-			buffer[replylength++] = 0;  /* no error msg yet */
-			buffer[replylength++] = UNDEFINEDERROR;
-			fprintf(stderr,
-			    "in.tnamed: format (%s) not supported\n", hostname);
-			sleep(5);  /* pause before saying something negative */
-			goto sendreply;
-		}
-
-		if ((hp = gethostbyname(hostname)) == NULL) {
-			buffer[replylength++] = ERRORCODE;
-			buffer[replylength++] = 0;  /* no error msg yet */
-			buffer[replylength++] = NOTFOUNDERROR;
-			fprintf(stderr, "in.tnamed: name (%s) not found\n",
-			    hostname);
-			sleep(5);  /* pause before saying something negative */
-			goto sendreply;
-		}
-
-		if (hp->h_addrtype != AF_INET) {
-			buffer[replylength++] = ERRORCODE;
-			buffer[replylength++] = 0;  /* no error msg yet */
-			buffer[replylength++] = UNDEFINEDERROR;
-			fprintf(stderr,
-			    "in.tnamed: address type (%d) not AF_INET\n",
-			    hp->h_addrtype);
-			sleep(5);  /* pause before saying something negative */
-			goto sendreply;
-		}
-
-		fprintf(stderr, "in.tnamed: %s asked for address of %s",
-		    inet_ntoa(client.sin_addr), hostname);
-		bcopy(hp->h_addr, (char *)&x, sizeof (x));
-		printf(" - it's %s\n", inet_ntoa(x));
-
-		buffer[replylength++] = ADDRESSCODE;
-		buffer[replylength++] = hp->h_length;
-		bcopy(hp->h_addr, &buffer[replylength], hp->h_length);
-		replylength += hp->h_length;
-
-	sendreply:
-		if (sendto(s, buffer, replylength, 0,
-		    (struct sockaddr *)&client, clientlength)
-		    != replylength) {
-			perror("in.tnamed: sendto error");
-			continue;
-		}
-	}
-}
-
-/* ARGSUSED */
-static void
-handler(int sig)
-{
-	exit(0);
-}
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/tname.xml b/usr/src/cmd/cmd-inet/usr.sbin/tname.xml
deleted file mode 100644
index 6fb81def92..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sbin/tname.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
- 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.
-
- 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
-
-	ident	"%Z%%M%	%I%	%E% SMI"
-
-	NOTE:  This service manifest is not editable; its contents will
-	be overwritten by package or patch operations, including
-	operating system upgrade.  Make customizations in a different
-	file.
--->
-
-<service_bundle type='manifest' name='SUNWtnamr:tnamed'>
-
-<service
-	name='network/tname'
-	type='service'
-	version='1'>
-
-	<create_default_instance enabled='false' />
-
-	<restarter>
-		<service_fmri value='svc:/network/inetd:default' />
-	</restarter>
-
-	<exec_method
-		type='method'
-		name='inetd_start'
-		exec='/usr/sbin/in.tnamed'
-		timeout_seconds='0'>
-		<method_context>
-			<method_credential user='root' group='root' />
-		</method_context>
-	</exec_method>
-
-	<exec_method
-		type='method'
-		name='inetd_offline'
-		exec=':kill_process'
-		timeout_seconds='0'>
-	</exec_method>
-
-	<exec_method
-		type='method'
-		name='inetd_disable'
-		exec=':kill'
-		timeout_seconds='0'>
-	</exec_method>
-
-	<property_group name='inetd' type='framework'>
-		<propval name='name' type='astring' value='name' />
-		<propval name='endpoint_type' type='astring' value='dgram' />
-		<propval name='wait' type='boolean' value='true' />
-		<propval name='isrpc' type='boolean' value='false' />
-		<propval name='proto' type='astring' value='udp' />
-	</property_group>
-
-	<stability value='Unstable' />
-
-	<template>
-		<common_name>
-			<loctext xml:lang='C'>
-				trivial name server
-			</loctext>
-		</common_name>
-		<documentation>
-			<manpage title='in.tnamed' section='1M'
-				manpath='/usr/share/man' />
-		</documentation>
-	</template>
-</service>
-
-</service_bundle>
diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile
index b8db5ef4c9..35d1ffee7c 100644
--- a/usr/src/pkgdefs/Makefile
+++ b/usr/src/pkgdefs/Makefile
@@ -359,8 +359,6 @@ COMMON_SUBDIRS= \
 	SUNWter  \
 	SUNWtftpr  \
 	SUNWtftp  \
-	SUNWtnamr \
-	SUNWtnamd \
 	SUNWtnetc \
 	SUNWtnetr \
 	SUNWtnetd \
diff --git a/usr/src/pkgdefs/SUNWcsr/postinstall b/usr/src/pkgdefs/SUNWcsr/postinstall
index 8faff6e48f..5bbdd97e7d 100644
--- a/usr/src/pkgdefs/SUNWcsr/postinstall
+++ b/usr/src/pkgdefs/SUNWcsr/postinstall
@@ -103,6 +103,17 @@ cat >> $BASEDIR/var/svc/profile/upgrade <<\_DEL_BIND8
 _DEL_BIND8
 
 #
+# Get rid of obsolete DARPA trivial name server (Death to IEN-116!)
+#
+cat >> $BASEDIR/var/svc/profile/upgrade <<\_DEL_TNAME
+	svcs svc:/network/tname > /dev/null 2>&1
+	if [ "$?" = 0 ]; then
+		svcadm disable -s svc:/network/tname
+		svccfg delete svc:/network/tname
+	fi
+_DEL_TNAME
+
+#
 # Remove stale GLD services
 #
 SVCCFG_REPOSITORY=$PKG_INSTALL_ROOT/etc/svc/repository.db
diff --git a/usr/src/pkgdefs/SUNWtnamd/Makefile b/usr/src/pkgdefs/SUNWtnamd/Makefile
deleted file mode 100644
index 647da669ec..0000000000
--- a/usr/src/pkgdefs/SUNWtnamd/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# 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.
-#
-# 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
-#
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-all: $(FILES)
-
-install: all pkg
-
-include ../Makefile.targ
-
diff --git a/usr/src/pkgdefs/SUNWtnamd/depend b/usr/src/pkgdefs/SUNWtnamd/depend
deleted file mode 100644
index b02f35bd15..0000000000
--- a/usr/src/pkgdefs/SUNWtnamd/depend
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# 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.
-#
-# 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
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-#
-
-P SUNWcar	Core Architecture, (Root)
-P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWckr	Core Solaris Kernel (Root)
-P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
-R SUNWtnamr	Trivial Name Server (Root)
diff --git a/usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl b/usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl
deleted file mode 100644
index b28c533836..0000000000
--- a/usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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"
-#
-
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWtnamd"
-NAME="Trivial Name Server (Usr)"
-ARCH="ISA"
-VERSION="ONVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Trivial Name Server (Usr)"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="true"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
diff --git a/usr/src/pkgdefs/SUNWtnamd/prototype_com b/usr/src/pkgdefs/SUNWtnamd/prototype_com
deleted file mode 100644
index 7c78783408..0000000000
--- a/usr/src/pkgdefs/SUNWtnamd/prototype_com
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# 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.
-#
-# 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 (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWtnamd
-#
-d none usr 755 root sys
-d none usr/sbin 755 root bin
-f none usr/sbin/in.tnamed 555 root bin
diff --git a/usr/src/pkgdefs/SUNWtnamd/prototype_i386 b/usr/src/pkgdefs/SUNWtnamd/prototype_i386
deleted file mode 100644
index cb94f63159..0000000000
--- a/usr/src/pkgdefs/SUNWtnamd/prototype_i386
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# 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.
-#
-# 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 (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-# List files which are i386 specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWtnamd
-#
diff --git a/usr/src/pkgdefs/SUNWtnamd/prototype_sparc b/usr/src/pkgdefs/SUNWtnamd/prototype_sparc
deleted file mode 100644
index 454918b07a..0000000000
--- a/usr/src/pkgdefs/SUNWtnamd/prototype_sparc
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# 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.
-#
-# 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 (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWtnamd
-#
diff --git a/usr/src/pkgdefs/SUNWtnamr/Makefile b/usr/src/pkgdefs/SUNWtnamr/Makefile
deleted file mode 100644
index 3244add378..0000000000
--- a/usr/src/pkgdefs/SUNWtnamr/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# 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.
-#
-# 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 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-DATAFILES += i.manifest r.manifest depend
-
-all: $(FILES)
-
-install: all pkg
-
-include ../Makefile.targ
-include ../Makefile.prtarg
-
diff --git a/usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl b/usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl
deleted file mode 100644
index 9f6b839033..0000000000
--- a/usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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"
-#
-
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWtnamr"
-NAME="Trivial Name Server (Root)"
-ARCH="ISA"
-VERSION="ONVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Trivial Name Server (Root)"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none manifest"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="true"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
diff --git a/usr/src/pkgdefs/SUNWtnamr/prototype_com b/usr/src/pkgdefs/SUNWtnamr/prototype_com
deleted file mode 100644
index 0afcaa03b7..0000000000
--- a/usr/src/pkgdefs/SUNWtnamr/prototype_com
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# 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.
-#
-# 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 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-i i.manifest
-i r.manifest
-#
-# source locations relative to the prototype file
-#
-# SUNWtnamr
-#
-d none var 0755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-f manifest var/svc/manifest/network/tname.xml 0444 root sys
diff --git a/usr/src/pkgdefs/SUNWtnamr/prototype_i386 b/usr/src/pkgdefs/SUNWtnamr/prototype_i386
deleted file mode 100644
index 24b256be40..0000000000
--- a/usr/src/pkgdefs/SUNWtnamr/prototype_i386
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# 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.
-#
-# 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 (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-# List files which are i386 specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWtnamr
-#
diff --git a/usr/src/pkgdefs/SUNWtnamr/prototype_sparc b/usr/src/pkgdefs/SUNWtnamr/prototype_sparc
deleted file mode 100644
index e0d1c32387..0000000000
--- a/usr/src/pkgdefs/SUNWtnamr/prototype_sparc
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# 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.
-#
-# 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 (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWtnamr
-#
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh
index 3887a7e754..069b00606f 100644
--- a/usr/src/tools/scripts/bfu.sh
+++ b/usr/src/tools/scripts/bfu.sh
@@ -1052,6 +1052,7 @@ smf_obsolete_manifests="
 	var/svc/manifest/system/filesystem/volfs.xml
 	var/svc/manifest/network/pfil.xml
 	var/svc/manifest/platform/sun4u/mpxio-upgrade.xml
+	var/svc/manifest/network/tname.xml
 "
 
 # smf services whose manifests have been renamed