--- a/usr/src/Makefile.lint	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/Makefile.lint	Sun Aug 15 15:22:57 2010 -0400
@@ -305,7 +305,6 @@
 	cmd/vrrpadm \
 	cmd/vt \
 	cmd/wall \
-	cmd/wbem \
 	cmd/who \
 	cmd/whodo \
 	cmd/wracct \

--- a/usr/src/cmd/Makefile	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/Makefile	Sun Aug 15 15:22:57 2010 -0400
@@ -429,7 +429,6 @@
 	vt		\
 	w		\
 	wall		\
-	wbem		\
 	which		\
 	who		\
 	whodo		\
@@ -723,7 +722,6 @@
 	vrrpadm		\
 	vscan		\
 	w		\
-	wbem		\
 	who		\
 	whodo		\
 	wracct		\

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/Makefile	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/Makefile	Sun Aug 15 15:22:57 2010 -0400
@@ -45,7 +45,6 @@
 SERVER_JAR= 		dhcpsvc.jar
 SERVER_JARFILES=	com/sun/dhcpmgr/server/*.class \
 			com/sun/dhcpmgr/bridge/*.class \
-			com/sun/dhcpmgr/server/*.properties \
 			com/sun/dhcpmgr/bridge/*.properties
 
 

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/bin/dhcpmgr.sh	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/bin/dhcpmgr.sh	Sun Aug 15 15:22:57 2010 -0400
@@ -25,14 +25,10 @@
 DMDIR=/usr/sadm/admin/dhcpmgr
 DLDIR=/usr/lib/inet/dhcp/svcadm
 L10NDIR=/usr/share/lib/locale
-WBEMDIR=/usr/sadm/lib/wbem
 
-CLASSPATH=${L10NDIR}:${DMDIR}/dhcpmgr.jar:${DMDIR}/SUNWfiles.jar:${DMDIR}/SUNWbinfiles.jar:${DLDIR}/dhcpsvc.jar:${DLDIR}/dhcpcommon.jar:${WBEMDIR}/providerutility.jar
+CLASSPATH=${L10NDIR}:${DMDIR}/dhcpmgr.jar:${DMDIR}/SUNWfiles.jar:${DMDIR}/SUNWbinfiles.jar:${DLDIR}/dhcpsvc.jar:${DLDIR}/dhcpcommon.jar
 export CLASSPATH
 
-LD_LIBRARY_PATH=${WBEMDIR}
-export LD_LIBRARY_PATH
-
 # add /usr/dt/bin so sdtwebclient will be available for help
 PATH=${PATH}:/usr/dt/bin
 export PATH

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/ConfigureDhcp.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/ConfigureDhcp.java	Sun Aug 15 15:22:57 2010 -0400
@@ -45,8 +45,6 @@
      */
     static final int supportedOptions[] = {
 	DhcpCfg.NON_NEGOTIABLE_LEASE,
-	DhcpCfg.HOSTS_RESOURCE,
-	DhcpCfg.HOSTS_DOMAIN,
 	DhcpCfg.LEASE_LENGTH,
 	DhcpCfg.DNS_ADDRESSES,
 	DhcpCfg.DNS_DOMAIN,
@@ -130,41 +128,6 @@
 	    return (DhcpCfg.FAILURE);
 	}
 
-	// Retrieve the hosts resource and domain options and validate.
-	//
-	String hostsResource = options.valueOf(DhcpCfg.HOSTS_RESOURCE);
-	String hostsDomain = options.valueOf(DhcpCfg.HOSTS_DOMAIN);
-
-	if (hostsResource == null) {
-	    if (hostsDomain != null) {
-		String msg = getString("config_requires_hosts_resource_error");
-		throw new IllegalArgumentException(msg);
-	    }
-        } else if (hostsResource.equals(DhcpdOptions.DSVC_CV_DNS)) {
-            if (hostsDomain == null) {
-                Object [] arguments = new Object[1];
-                arguments[0] = hostsResource;
-                printErrMessage(
-                    getString("config_requires_hosts_domain_error"),
-                    arguments);
-                return (DhcpCfg.FAILURE);
-            }
-	} else if (hostsResource.equals(DhcpdOptions.DSVC_CV_FILES)) {
-	    if (hostsDomain != null) {
-		Object [] arguments = new Object[1];
-		arguments[0] = hostsResource;
-		printErrMessage(getString("config_hosts_domain_ignored_error"),
-		    arguments);
-		return (DhcpCfg.FAILURE);
-	    }
-	} else {
-	    Object [] arguments = new Object[1];
-	    arguments[0] = hostsResource;
-	    printErrMessage(getString("config_invalid_hosts_resource_error"),
-		arguments);
-	    return (DhcpCfg.FAILURE);
-	}
-
 	// Retrieve the leaseLength option and check its validity.
 	// The default (3600*24 = 1 day) should be defined as static somewhere.
 	//
@@ -238,12 +201,6 @@
 	DhcpdOptions dhcpdOptions = new DhcpdOptions();
 	dhcpdOptions.setDaemonEnabled(true);
 	dhcpdOptions.setDhcpDatastore(getDhcpDatastore());
-	if (hostsResource != null) {
-	    dhcpdOptions.setHostsResource(hostsResource);
-	}
-	if (hostsDomain != null) {
-	    dhcpdOptions.setHostsDomain(hostsDomain);
-	}
 	try {
 	    getSvcMgr().writeDefaults(dhcpdOptions);
 	    printMessage(getString("config_create_conf_progress"));

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/ConvertDataStore.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/ConvertDataStore.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  */
@@ -73,7 +71,7 @@
 		options.valueOf(DhcpCfg.RESOURCE)));
 	    getDhcpDatastore().setLocation(options.valueOf(DhcpCfg.PATH));
 	    getDhcpDatastore().setConfig(
-	        options.valueOf(DhcpCfg.RESOURCE_CONFIG));
+		options.valueOf(DhcpCfg.RESOURCE_CONFIG));
 	} catch (Throwable e) {
 	    // resource will not be valid
 	}
@@ -218,8 +216,7 @@
 	    for (int i = 0; i < networks.length; ++i) {
 		String netString = networks[i].toString();
 		try {
-		    getNetMgr().deleteNetwork(netString, false, false,
-			oldDatastore);
+		    getNetMgr().deleteNetwork(netString, false, oldDatastore);
 		    Object [] arguments = new Object[1];
 		    arguments[0] = netString;
 		    printMessage(getString("convert_delete_network_progress"),

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/DhcpCfg.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/DhcpCfg.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -36,7 +34,7 @@
  * This class represents the entry point to the DHCP CLI dhcp configuration
  * administration.
  */
-public class DhcpCfg 
+public class DhcpCfg
     extends DhcpCliProgram {
 
     /**
@@ -48,7 +46,7 @@
      * The valid options for all DhcpCfg administration.
      */
     private static String optString =
-	"DUCnfxbkgh;I:R:N:X:r;p:u:l:d;a:m:t:y:s:o:P;Seq";
+	"DUCnfxbkgI:R:N:X:r;p:u:l:d;a:m:t:y:s:o:P;Seq";
 
     public static final int CONFIGURE_DHCP		= 'D';
     public static final int CONFIGURE_BOOTP		= 'R';
@@ -66,8 +64,6 @@
     public static final int DELETE_TABLES		= 'x';
     public static final int KEEP_TABLES			= 'k';
     public static final int POINT_TO_POINT		= 'b';
-    public static final int HOSTS_RESOURCE		= 'h';
-    public static final int DELETE_HOSTS		= 'h';
     public static final int RESOURCE			= 'r';
     public static final int RESOURCE_CONFIG		= 'u';
     public static final int PATH			= 'p';
@@ -82,7 +78,6 @@
     public static final int OPTION_LIST			= 'o';
     public static final int ROUTER_ADDRESSES		= 't';
     public static final int NIS_DOMAIN			= 'y';
-    public static final int HOSTS_DOMAIN		= 'y';
     public static final int SIGHUP			= 'g';
     public static final int SERVICE_ENABLE		= 'e';
     public static final int SERVICE_REENABLE		= 'r';
@@ -177,7 +172,7 @@
      * @param value the option value(if any)
      * @exception IllegalArgumentException if an invalid argument was entered
      */
-    public void processArg(int option, String value) 
+    public void processArg(int option, String value)
 	throws IllegalArgumentException {
 
     	switch (option) {

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/ResourceBundle.properties	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/ResourceBundle.properties	Sun Aug 15 15:22:57 2010 -0400
@@ -1,5 +1,3 @@
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -32,10 +30,7 @@
 config_null_datastore_error=Error - cannot configure without resource and path options.
 config_invalid_resource_error=Error - {0} is not a valid resource.
 config_make_location_error=Error - creating location: {0}.
-config_requires_hosts_domain_error=Error - host resource requires a host domain.
 config_hosts_domain_ignored_error=Error - host domain does not make sense for a host resource type - {0}
-config_invalid_hosts_resource_error=Error - host resource is invalid - {0}
-config_requires_hosts_resource_error=Error - host domain requires a host resource.
 config_lease_error=Error - the lease value specified is not valid.
 config_lease_zero_error=Error - a lease value of zero is not valid.
 config_dns_error=Error - DNS domain or server information is incomplete.
@@ -141,7 +136,7 @@
 #
 dhcpcfg_invalid_arg=Invalid argument - {0}
 dhcpcfg_no_function_error=Error - must specify one of 'D', 'R', 'U', 'N', 'C', 'X', 'I', 'P' or 'S'.
-dhcpcfg_usage=dhcpconfig (options)\n\nWhere (options) is one of:\n\n -D -r (resource) -p (path)  Configure the DHCP service. Sub-options:\n                             [-u (uninterpreted data)]\n                             [-h (host resource)]\n                             [-y (host domain)]\n                             [-l (lease length)]\n                             [-n]    Leases are not negotiable\n                             [-d (DNS domain)]\n                             [-a (DNS servers)]\n\n -R (server addresses) Configure BOOTP relay service.\n\n -U                    Unconfigure DHCP or BOOTP relay service. Sub-options:\n                       [-f]     No confirmation prompt\n                       [-x]     Delete dhcptab and network tables\n                       [-h]     Delete host entries\n\n -N (network address)  Configure network. Sub-options:\n                       [-m (subnet mask)]\n                       [-t (router addresses)]\n                       [-y (NIS domain)]\n                       [-a (NIS addreses)]\n                       [-b]     Network is point-to-point\n                       [-g]     Signal daemon\n\n -C -r (resource) -p (path)  Convert to new data store. Sub-options:\n                             [-u (uninterpreted data)]\n                             [-f]     No confirmation prompt\n                             [-k]     Do not delete original files\n\n -X (export filename)  Export data. Sub-options:\n                       [-m (macro list)]\n                       [-o (option list)]\n                       [-a (network addresses)]\n                       [-f]     Overwrite an existing export file\n                       [-x]     Delete exported data\n                       [-g]     Signal daemon\n\n -I (import filename)  Import data. Sub-options:\n                       [-f]     Overwrite existing data\n                       [-g]     Signal daemon\n\n -P [parameter[=value]]  Configure or print DHCP server parameters.\n\n -S                    Control the DHCP server. Sub-options:\n                       [-e]     Enable and start the DHCP server\n                       [-d]     Disable and stop the DHCP server\n                       [-r]     Re-enable the DHCP server\n                       [-q]     Query the DHCP server status\n
+dhcpcfg_usage=dhcpconfig (options)\n\nWhere (options) is one of:\n\n -D -r (resource) -p (path)  Configure the DHCP service. Sub-options:\n                             [-u (uninterpreted data)]\n                             [-l (lease length)]\n                             [-n]    Leases are not negotiable\n                             [-d (DNS domain)]\n                             [-a (DNS servers)]\n\n -R (server addresses) Configure BOOTP relay service.\n\n -U                    Unconfigure DHCP or BOOTP relay service. Sub-options:\n                       [-f]     No confirmation prompt\n                       [-x]     Delete dhcptab and network tables\n\n -N (network address)  Configure network. Sub-options:\n                       [-m (subnet mask)]\n                       [-t (router addresses)]\n                       [-y (NIS domain)]\n                       [-a (NIS addreses)]\n                       [-b]     Network is point-to-point\n                       [-g]     Signal daemon\n\n -C -r (resource) -p (path)  Convert to new data store. Sub-options:\n                             [-u (uninterpreted data)]\n                             [-f]     No confirmation prompt\n                             [-k]     Do not delete original files\n\n -X (export filename)  Export data. Sub-options:\n                       [-m (macro list)]\n                       [-o (option list)]\n                       [-a (network addresses)]\n                       [-f]     Overwrite an existing export file\n                       [-x]     Delete exported data\n                       [-g]     Signal daemon\n\n -I (import filename)  Import data. Sub-options:\n                       [-f]     Overwrite existing data\n                       [-g]     Signal daemon\n\n -P [parameter[=value]]  Configure or print DHCP server parameters.\n\n -S                    Control the DHCP server. Sub-options:\n                       [-e]     Enable and start the DHCP server\n                       [-d]     Disable and stop the DHCP server\n                       [-r]     Re-enable the DHCP server\n                       [-q]     Query the DHCP server status\n
 
 #
 # ServerParameter errors.

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/UnconfigureDhcp.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/dhcpconfig/UnconfigureDhcp.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  */
@@ -45,8 +43,7 @@
      */
     static final int supportedOptions[] = {
 	DhcpCfg.FORCE,
-	DhcpCfg.DELETE_TABLES,
-	DhcpCfg.DELETE_HOSTS
+	DhcpCfg.DELETE_TABLES
     };
 
     /**
@@ -119,10 +116,6 @@
 	//
 	boolean deleteTables = options.isSet(DhcpCfg.DELETE_TABLES);
 
-	// Should we delete the host entries?
-	//
-	boolean deleteHosts = options.isSet(DhcpCfg.DELETE_HOSTS);
-	
 	// If this server is just acting as a relay then we don't need to
 	// clean up the dhcptab or the networks.
 	//
@@ -164,8 +157,7 @@
 		for (int i = 0; i < networks.length; ++i) {
 		    String netString = networks[i].toString();
 		    try {
-			getNetMgr().deleteNetwork(netString, false,
-			    deleteHosts);
+			getNetMgr().deleteNetwork(netString, false);
 			Object [] arguments = new Object[1];
 			arguments[0] = netString;
 			printMessage(getString("unconfigure_network_progress"),

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/AddClientEntry.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/AddClientEntry.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -48,7 +46,6 @@
 	PntAdm.COMMENT,
 	PntAdm.LEASE_EXPIRATION,
 	PntAdm.FLAGS,
-	PntAdm.HOST_NAME,
 	PntAdm.CLIENTID,
 	PntAdm.CONVERT_CLIENTID,
 	PntAdm.MACRO_NAME,
@@ -85,7 +82,7 @@
 
     /**
      * Executes the "add client" functionality.
-     * @return PntAdm.SUCCESS, PntAdm.EXISTS, PntAdm.WARNING, or 
+     * @return PntAdm.SUCCESS, PntAdm.EXISTS, PntAdm.WARNING, or
      * PntAdm.CRITICAL
      */
     public int execute()
@@ -116,15 +113,6 @@
 		dhcpClientRecord.setFlags(flags);
 	    }
 
-	    String clientName = options.valueOf(PntAdm.HOST_NAME);
-	    if (clientName != null) {
-		if (isHostsManaged()) {
-		    dhcpClientRecord.setClientName(clientName);
-		} else {
-		    returnCode = PntAdm.WARNING;
-		}
-	    }
-
 	    String serverIP = options.valueOf(PntAdm.SERVER);
 	    if (serverIP == null) {
 		serverIP = getSvcMgr().getServerName();
@@ -143,7 +131,7 @@
 		    String msg = getString("no_macro_specified");
 		    throw new IllegalArgumentException(msg);
 		}
-		
+
 		// Create a Macro entry so that we can check to see if it
 		// exists in the dhcptab.
 		//

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/DeleteClientEntry.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/DeleteClientEntry.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  */
@@ -43,7 +41,6 @@
      * The valid options associated with deleting a client entry.
      */
     static final int supportedOptions[] = {
-	PntAdm.DELETE_HOST,
 	PntAdm.RESOURCE,
 	PntAdm.RESOURCE_CONFIG,
 	PntAdm.PATH
@@ -83,14 +80,6 @@
 
 	int returnCode = PntAdm.SUCCESS;
 
-	// Check to see if the user wants the host deleted.
-	//
-	boolean deleteHost = options.isSet(PntAdm.DELETE_HOST);
-	if (deleteHost && !isHostsManaged()) {
-		deleteHost = false;
-		returnCode = PntAdm.WARNING;
-	}
-
 	// Build up a DhcpClientRecord from the user specified options.
 	//
 	try {
@@ -108,7 +97,7 @@
 	    // if requested.
 	    //
 	    getNetMgr().deleteClient(dhcpClientRecord, network.toString(),
-		deleteHost, getDhcpDatastore());
+		getDhcpDatastore());
 
 	} catch (NoEntryException e) {
 	    printErrMessage(getMessage(e));

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/ModifyClientEntry.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/ModifyClientEntry.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -49,7 +47,6 @@
 	PntAdm.COMMENT,
 	PntAdm.LEASE_EXPIRATION,
 	PntAdm.FLAGS,
-	PntAdm.HOST_NAME,
 	PntAdm.CLIENTID,
 	PntAdm.CONVERT_CLIENTID,
 	PntAdm.MACRO_NAME,
@@ -146,15 +143,6 @@
 		newDhcpClientRecord.setFlags(flags);
 	    }
 
-	    String clientName = options.valueOf(PntAdm.HOST_NAME);
-	    if (clientName != null) {
-		if (isHostsManaged()) {
-		    newDhcpClientRecord.setClientName(clientName);
-		} else {
-		    returnCode = PntAdm.WARNING;
-		}
-	    }
-
 	    String serverIP = options.valueOf(PntAdm.SERVER);
 	    if (serverIP == null) {
 		serverIP = getSvcMgr().getServerName();
@@ -173,7 +161,7 @@
 		    String msg = getString("no_macro_specified");
 		    throw new IllegalArgumentException(msg);
 		}
-		
+
 		// Create a Macro entry so that we can check to see if it
 		// exists in the dhcptab.
 		//

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/PntAdm.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/PntAdm.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  */
@@ -46,7 +44,7 @@
     /**
      * The valid options for all PntAdm administration.
      */
-    private static String optString = "LPCRyavxA:D:M:r:p:u:s:i:f:e:h:m:c:n:B;";
+    private static String optString = "LPCRyavxA:D:M:r:p:u:s:i:f:e:m:c:n:B;";
 
     public static final int ADD_CLIENT_ENTRY		= 'A';
     public static final int MODIFY_CLIENT_ENTRY		= 'M';
@@ -58,7 +56,6 @@
     public static final int BATCH_EXECUTION		= 'B';
 
     public static final int VERIFY_MACRO	= 'y';
-    public static final int DELETE_HOST		= 'y';
     public static final int CONVERT_CLIENTID	= 'a';
     public static final int RAW			= 'x';
     public static final int VERBOSE		= 'v';
@@ -69,7 +66,6 @@
     public static final int CLIENTID		= 'i';
     public static final int FLAGS		= 'f';
     public static final int LEASE_EXPIRATION	= 'e';
-    public static final int HOST_NAME		= 'h';
     public static final int MACRO_NAME		= 'm';
     public static final int COMMENT		= 'c';
     public static final int NEW_IP		= 'n';
@@ -186,7 +182,7 @@
 	    DhcpCliPrint.printErrMessage(msg.toString());
 	    returnCode = CRITICAL;
 	}
-	
+
 	return (returnCode);
 
     } // execute
@@ -197,7 +193,7 @@
      * @param value the option value(if any)
      * @exception IllegalArgumentException if an invalid argument was entered
      */
-    public void processArg(int option, String value) 
+    public void processArg(int option, String value)
 	throws IllegalArgumentException {
 
     	switch (option) {

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/RemoveNetworkTable.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/RemoveNetworkTable.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  */
@@ -87,7 +85,7 @@
 
 	    // Delete the network table.
 	    //
-	    getNetMgr().deleteNetwork(network.toString(), false, false,
+	    getNetMgr().deleteNetwork(network.toString(), false,
 		getDhcpDatastore());
 	} catch (NoTableException e) {
 	    printErrMessage(getMessage(e));

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/ResourceBundle.properties	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/pntadm/ResourceBundle.properties	Sun Aug 15 15:22:57 2010 -0400
@@ -1,5 +1,3 @@
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -95,4 +93,4 @@
 #
 # Usage
 #
-usage=pntadm [-r (resource)] [-p (path)] [-u (uninterpreted data)] (options) [(network ip or name)]\n\nWhere (options) is one of:\n\n -C                     Create the named table\n\n -A (client ip or name) Add client entry. Sub-options:\n                        [-c (comment)]\n                        [-e (lease expiration)]\n                        [-f (flags)]\n                        [-h (client host name)]\n                        [-i (client identifier)[-a]]\n                        [-m (dhcptab macro reference)[-y]]\n                        [-s (server ip or name)]\n\n -M (client ip or name) Modify client entry. Sub-options:\n                        [-c (new comment)]\n                        [-e (new lease expiration)]\n                        [-f (new flags)]\n                        [-h (new client host name)]\n                        [-i (new client identifier)[-a]]\n                        [-m (new dhcptab macro reference)[-y]]\n                        [-n (new client ip)]\n                        [-s (new server ip or name)]\n\n -D (client ip or name) Delete client entry. Sub-options:\n                        [-y]    Remove hosts table entry\n\n -R                     Remove the named table\n\n -P                     Display the named table. Sub-options:\n                        [-v]    Display lease time in full format.\n                        [-x]    Display lease time in raw format.\n\n -L                     List the configured DHCP networks\n\n -B [batchfile]         Run command in batch input mode. Sub-options:\n                        [-v]    Output commands as they are processed.\n\n The network ip or name argument is required for all options except -L and -B\n
+usage=pntadm [-r (resource)] [-p (path)] [-u (uninterpreted data)] (options) [(network ip or name)]\n\nWhere (options) is one of:\n\n -C                     Create the named table\n\n -A (client ip or name) Add client entry. Sub-options:\n                        [-c (comment)]\n                        [-e (lease expiration)]\n                        [-f (flags)]\n                        [-i (client identifier)[-a]]\n                        [-m (dhcptab macro reference)[-y]]\n                        [-s (server ip or name)]\n\n -M (client ip or name) Modify client entry. Sub-options:\n                        [-c (new comment)]\n                        [-e (new lease expiration)]\n                        [-f (new flags)]\n                        [-i (new client identifier)[-a]]\n                        [-m (new dhcptab macro reference)[-y]]\n                        [-n (new client ip)]\n                        [-s (new server ip or name)]\n\n -D (client ip or name) Delete client entry.\n\n -R                     Remove the named table\n\n -P                     Display the named table. Sub-options:\n                        [-v]    Display lease time in full format.\n                        [-x]    Display lease time in raw format.\n\n -L                     List the configured DHCP networks\n\n -B [batchfile]         Run command in batch input mode. Sub-options:\n                        [-v]    Output commands as they are processed.\n\n The network ip or name argument is required for all options except -L and -B\n

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/tests/cfgdhcp.san	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/cli/tests/cfgdhcp.san	Sun Aug 15 15:22:57 2010 -0400
@@ -21,8 +21,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
@@ -119,7 +117,6 @@
 #
 SRVNAME=`uname -n`
 SRVADDR=`get_server_ip`
-DHCPHOSTS_RSRC=files
 DHCP_DEFAULTS=/etc/inet/dhcpsvc.conf
 
 #
@@ -136,7 +133,7 @@
 #
 # Config.
 #
-/usr/sbin/dhcpconfig -D -r ${DHCPRSRC} -p ${DHCPPATH} -h ${DHCPHOSTS_RSRC} >>${OUTFILE} 2>&1
+/usr/sbin/dhcpconfig -D -r ${DHCPRSRC} -p ${DHCPPATH} >>${OUTFILE} 2>&1
 RET=$?
 if [ "${RET}" != "0" ]
 then
@@ -189,17 +186,6 @@
 fi
 
 #
-# Verify that the hosts resource was defined in the defaults file
-#
-DEFLINE=`grep "HOSTS_RESOURCE=${DHCPHOSTS_RSRC}" ${DHCP_DEFAULTS}`
-if [ -z "${DEFLINE}" ]
-then
-    echo "HOSTS_RESOURCE not set correctly in ${DHCP_DEFAULTS}"
-    echo "${TESTNAME} - Test failed!"
-    exit 1
-fi
-
-#
 # Verify that the dhcptab data was created.
 #
 DATAFILE=/tmp/${TESTNAME}.data.$$

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/AddressWizard.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/AddressWizard.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -57,8 +55,6 @@
     private String server = DataManager.get().getShortServerName();
     private IPAddress serverIP;
     private IPAddress startAddress;
-    private boolean generateNames = false;
-    private String baseName = DataManager.get().getShortServerName();
     private String macro = DataManager.get().getShortServerName();
     private boolean unusable = false;
     private boolean dynamic = true;
@@ -68,26 +64,26 @@
     class Address {
 	IPAddress addr;
 	String name;
-	
+
 	public Address() {
 	    addr = null;
 	    name = "";
 	}
-	
+
 	public Address(int a, String n) {
 	    name = n;
 	    setAddr(a);
 	}
-	
+
 	public Address(String a, String n) {
 	    name = n;
 	    setAddr(a);
 	}
-	
+
 	public void setAddr(int a) {
 	    addr = new IPAddress(a);
 	}
-	
+
 	public void setAddr(String a) {
 	    try {
 		addr = new IPAddress(a);
@@ -95,7 +91,7 @@
 		// Do nothing
 	    }
 	}
-	
+
 	public String toString() {
 	    return addr.getHostAddress();
 	}
@@ -103,15 +99,15 @@
 
     class WizardTableModel extends AbstractTableModel {
 	private Vector addrs = new Vector();
-	
+
 	public int getRowCount() {
 	    return addrs.size();
 	}
-	
+
 	public int getColumnCount() {
 	    return 2;
 	}
-	
+
 	public Object getValueAt(int row, int column) {
 	    if (column == 0) {
 		return ((Address)addrs.elementAt(row)).addr;
@@ -119,7 +115,7 @@
 		return ((Address)addrs.elementAt(row)).name;
 	    }
 	}
-	
+
 	public Class getColumnClass(int column) {
 	    if (column == 0) {
 		return IPAddress.class;
@@ -127,7 +123,7 @@
 		return String.class;
 	    }
 	}
-	
+
 	public String getColumnName(int column) {
 	    if (column == 0) {
 		return ResourceStrings.getString("address_column");
@@ -135,7 +131,7 @@
 		return ResourceStrings.getString("client_name_column");
 	    }
 	}
-	
+
 	public long generateAddresses() {
 	    if (!network.containsAddress(startAddress)) {
 		return 0;
@@ -190,14 +186,7 @@
 		}
 		if (searchAddress != address) {
 		    // found an empty slot; create the address
-		    Address addr;
-		    if (generateNames) {
-			addr  = new Address((int)address,
-			    baseName + "-" + String.valueOf(index));
-		    } else {
-			addr  = new Address((int)address, "");
-		    }
-		    addrs.addElement(addr);
+		    addrs.addElement(new Address((int)address, ""));
 		    ++count;
 		}
 		++index;
@@ -207,34 +196,34 @@
 	    fireTableDataChanged();
 	    return count;
 	}
-	
+
 	public Address getAddressAt(int index) {
 	    return (Address)addrs.elementAt(index);
 	}
     }
-    
+
     // This step selects the number of addresses and a comment
     class NumberStep implements WizardStep {
 	private Box stepBox;
 	private IntegerField addressCount;
 	private JTextField commentField;
-	
+
 	public NumberStep() {
 	    stepBox = Box.createVerticalBox();
-	    
+
 	    // Explanatory text at the top
 	    stepBox.add(Wizard.createTextArea(
 		ResourceStrings.getString("add_wiz_explain"), 4, 45));
 	    stepBox.add(Box.createVerticalStrut(10));
 	    stepBox.add(Box.createVerticalGlue());
-	    
+
 	    // Get the number of addresses to create
 	    stepBox.add(Wizard.createTextArea(
 		ResourceStrings.getString("add_wiz_count_explain"), 1, 45));
 
 	    Mnemonic mnCount =
                 new Mnemonic(ResourceStrings.getString("add_wiz_count_label"));
-    	    JLabel label = new JLabel(mnCount.getString());
+	    JLabel label = new JLabel(mnCount.getString());
             addressCount = new IntegerField(); // Ensure numeric input
             addressCount.setMaximumSize(addressCount.getPreferredSize());
 
@@ -249,7 +238,7 @@
 	    box.add(addressCount);
 	    box.add(Box.createHorizontalGlue());
 	    stepBox.add(box);
-	    
+
 	    stepBox.add(Box.createVerticalStrut(10));
 	    stepBox.add(Box.createVerticalGlue());
 	    stepBox.add(Wizard.createTextArea(
@@ -274,7 +263,7 @@
 	    box.add(commentField);
 	    stepBox.add(box);
 	    stepBox.add(Box.createVerticalGlue());
-	    
+
 	    /*
 	     * This listener ensures that the forward button is enabled only
 	     * when there is a count of addresses in the addressCount field.
@@ -292,21 +281,21 @@
 		}
 	    });
 	}
-	
+
 	public String getDescription() {
 	    return ResourceStrings.getString("add_wiz_number_desc");
 	}
-	
+
 	public Component getComponent() {
 	    return stepBox;
 	}
-	
+
 	public void setActive(int direction) {
 	    addressCount.setValue(number);
 	    commentField.setText(comment);
 	    setForwardEnabled(addressCount.getValue() != 0);
 	}
-	
+
 	public boolean setInactive(int direction) {
 	    number = addressCount.getValue();
 	    if (number == 0) {
@@ -329,17 +318,15 @@
     class ServerStep implements WizardStep {
 	private Box stepBox;
 	private IPAddressField startField;
-	private HostnameField baseNameField;
-	private JCheckBox generateNamesBox;
 	private HostnameField serverField;
-	
+
 	public ServerStep() {
 	    stepBox = Box.createVerticalBox();
-	    
+
 	    // Explanatory text at the top
 	    stepBox.add(Wizard.createTextArea(
 		ResourceStrings.getString("add_wiz_server_explain"), 1, 45));
-	    
+
 	    // Server to own these addresses
 	    Mnemonic mnMan =
                 new Mnemonic(ResourceStrings.getString("add_wiz_server_label"));
@@ -350,17 +337,17 @@
             serverField = new HostnameField("", 15);
             jl.setLabelFor(serverField);
             jl.setToolTipText(mnMan.getString());
-	    jl.setDisplayedMnemonic(mnMan.getMnemonic()); 
+	    jl.setDisplayedMnemonic(mnMan.getMnemonic());
 
 	    serverField.setMaximumSize(serverField.getPreferredSize());
 	    box.add(serverField);
 	    box.add(Box.createHorizontalGlue());
 	    stepBox.add(box);
-	    
+
 	    // Add some spacing
 	    stepBox.add(Box.createVerticalStrut(5));
 	    stepBox.add(Box.createVerticalGlue());
-	    
+
 	    // Starting address
 	    stepBox.add(Wizard.createTextArea(
 		ResourceStrings.getString("add_wiz_start_explain"), 2, 45));
@@ -379,60 +366,7 @@
 	    startField.setMaximumSize(startField.getPreferredSize());
 	    box.add(startField);
 	    stepBox.add(box);
-	    
-	    // Add some more spacing, and an explanation of generating names
-	    stepBox.add(Box.createVerticalStrut(5));
-	    stepBox.add(Box.createVerticalGlue());
-	    stepBox.add(Wizard.createTextArea(
-		ResourceStrings.getString("add_wiz_generate_explain"), 4, 45));
 
-	    // Control to indicate whether names should be generated
-	    JPanel panel = new JPanel(new GridLayout(2, 1, 0, 0));
-	    generateNamesBox = new JCheckBox(
-		ResourceStrings.getString("add_wiz_generate_label"));
-	    generateNamesBox.setToolTipText(
-	        ResourceStrings.getString("add_wiz_generate_label"));
-	    panel.add(generateNamesBox);
-
-	    generateNamesBox.setEnabled(true);
-	    try {
-		DhcpdOptions opts =
-		    DataManager.get().getDhcpServiceMgr().readDefaults();
-		if (opts.getHostsResource() == null) {
-		    generateNamesBox.setEnabled(false);		
-		}
-	    } catch (BridgeException e) {
-		// Assume set
-	    }
-
-	    baseNameField = new HostnameField();
-	    baseNameField.setEnabled(false);
-	    baseNameField.setMaximumSize(baseNameField.getPreferredSize());
-	    box = Box.createHorizontalBox();
-	    box.add(Box.createHorizontalStrut(17));
-
-	    Mnemonic mnRoot =
-                new Mnemonic(ResourceStrings.getString(
-		    "add_wiz_rootname_label"));
-            JLabel rootNameLbl = new JLabel(mnRoot.getString());
-            box.add(rootNameLbl);
-            rootNameLbl.setLabelFor(baseNameField);
-            rootNameLbl.setToolTipText(mnRoot.getString());
-	    rootNameLbl.setDisplayedMnemonic(mnRoot.getMnemonic());
-
-	    box.add(Box.createHorizontalStrut(5));
-	    box.add(baseNameField);
-	    panel.add(box);
-	    stepBox.add(panel);
-	    stepBox.add(Box.createVerticalGlue());
-	    
-	    // Only enable the text input if name generation is requested
-	    generateNamesBox.addActionListener(new ActionListener() {
-		public void actionPerformed(ActionEvent e) {
-		    baseNameField.setEnabled(generateNamesBox.isSelected());
-		}
-	    });
-	    
 	    DocumentListener docListener = new DocumentListener() {
 		public void insertUpdate(DocumentEvent e) {
 		    setForwardEnabled((startField.getText().length() != 0)
@@ -445,27 +379,25 @@
 		    insertUpdate(e);
 		}
 	    };
-	    
+
 	    startField.getDocument().addDocumentListener(docListener);
 	    serverField.getDocument().addDocumentListener(docListener);
 	}
-	
+
 	public String getDescription() {
 	    return ResourceStrings.getString("add_wiz_server_desc");
 	}
-	
+
 	public Component getComponent() {
 	    return stepBox;
 	}
-	
+
 	public void setActive(int direction) {
 	    serverField.setText(server);
 	    startField.setValue(startAddress);
-	    baseNameField.setText(baseName);
-	    generateNamesBox.setSelected(generateNames);
 	    setForwardEnabled(true);
 	}
-		
+
 	public boolean setInactive(int direction) {
 	    if (direction == FORWARD) {
 		// Validate that address is on the network we're working on
@@ -514,30 +446,28 @@
 	    }
 	    server = serverField.getText();
 	    startAddress = startField.getValue();
-	    generateNames = generateNamesBox.isSelected();
-	    baseName = baseNameField.getText();
 	    return true;
 	}
     }
-    
+
     // This step confirms the list of addresses to be generated
     class ConfirmStep implements WizardStep {
 	private JPanel stepPanel;
 	private JTable addressTable;
-	
+
 	public ConfirmStep() {
 	    stepPanel = new JPanel(new BorderLayout(10, 10));
-	    
+
 	    // Explanatory text at the top
 	    stepPanel.add(Wizard.createTextArea(
 		ResourceStrings.getString("add_wiz_confirm_explain"), 3, 45),
 		BorderLayout.NORTH);
-	    
+
 	    // Label the table
-       	    JPanel panel = new JPanel(new BorderLayout());
+	    JPanel panel = new JPanel(new BorderLayout());
             panel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 15));
 	    Mnemonic mnIP =
-	        new Mnemonic(ResourceStrings.getString(
+		new Mnemonic(ResourceStrings.getString(
 		    "add_wiz_confirm_label"));
             JLabel label = new JLabel(mnIP.getString());
             panel.add(label, BorderLayout.NORTH);
@@ -562,15 +492,15 @@
 	    panel.add(scrollPane, BorderLayout.CENTER);
 	    stepPanel.add(panel, BorderLayout.CENTER);
 	}
-	
+
 	public String getDescription() {
 	    return ResourceStrings.getString("add_wiz_confirm_desc");
 	}
-	
+
 	public Component getComponent() {
 	    return stepPanel;
 	}
-	
+
 	public void setActive(int direction) {
 	    /*
 	     * If we're activating coming from the previous step,
@@ -608,12 +538,12 @@
 		setForwardEnabled(true);
 	    }
 	}
-	
+
 	public boolean setInactive(int direction) {
 	    return true; // Nothing to do when leaving
 	}
     }
-    
+
     // This step selects the macro and flags
     class ConfigureStep implements WizardStep {
 
@@ -622,7 +552,7 @@
 		implements ComboBoxModel {
 	    private Object currentValue;
 	    private Macro data[] = null;
-	
+
 	    public int getSize() {
 		if (data == null) {
 		    try {
@@ -641,7 +571,7 @@
 		    return data.length+1;
 		}
 	    }
-	    
+
 	    public Object getElementAt(int index) {
 		if (data == null) {
 		    try {
@@ -659,7 +589,7 @@
 		    return data[index-1].getKey();
 		}
 	    }
-	    
+
 	    public void setSelectedItem(Object anItem) {
 		currentValue = noMacro.getKey();
 		for (int i = 0; data != null && i < data.length; i++) {
@@ -669,11 +599,11 @@
 		}
 		fireContentsChanged(this, -1, -1);
 	    }
-	    
+
 	    public Object getSelectedItem() {
 		return currentValue;
 	    }
-	    
+
 	    public Macro getMacroAt(int index) {
 		if (index == 0) {
 		    return noMacro;
@@ -682,13 +612,13 @@
 		}
 	    }
 	}
-	
+
 	private Box stepBox;
 	private JComboBox macroBox;
 	private MacroListModel macroBoxModel;
 	private JButton viewButton;
 	private JCheckBox unusableBox;
-	
+
 	public ConfigureStep() {
 	    stepBox = Box.createVerticalBox();
 
@@ -699,7 +629,7 @@
 	    stepBox.add(component);
 	    // Add some spacing
 	    stepBox.add(Box.createVerticalStrut(10));
-	    
+
 	    // Let 'em select the macro to use
 	    Mnemonic mnConf =
                 new Mnemonic(ResourceStrings.getString("add_wiz_macro_label"));
@@ -717,16 +647,16 @@
 	    panel.add(macroBox);
 	    // Button to view the contents of the selected macro
 
-	    Mnemonic mnView = 
-	        new Mnemonic(ResourceStrings.getString("add_wiz_view_button"));
+	    Mnemonic mnView =
+		new Mnemonic(ResourceStrings.getString("add_wiz_view_button"));
 	    viewButton = new JButton(mnView.getString());
 	    viewButton.setToolTipText(mnView.getString());
-	    viewButton.setMnemonic(mnView.getMnemonic()); 
+	    viewButton.setMnemonic(mnView.getMnemonic());
 
 	    panel.add(viewButton);
 	    panel.setAlignmentX(Component.LEFT_ALIGNMENT);
 	    stepBox.add(panel);
-	    
+
 	    // Give the option to mark them unusable for now
 	    component = Wizard.createTextArea(
 		ResourceStrings.getString("add_wiz_flag_explain"), 2, 45);
@@ -737,7 +667,7 @@
 	    unusableBox.setAlignmentX(Component.LEFT_ALIGNMENT);
 	    stepBox.add(unusableBox);
 	    stepBox.add(Box.createVerticalGlue());
-	    
+
 	    // When user presses View, show the macro's contents
 	    viewButton.addActionListener(new ActionListener() {
 		public void actionPerformed(ActionEvent e) {
@@ -747,51 +677,51 @@
 		     * context with the task.
 		     */
 		    ViewMacroDialog d = new ViewMacroDialog(
-		        AddressWizard.this, viewButton,
+			AddressWizard.this, viewButton,
 			macroBoxModel.getMacroAt(macroBox.getSelectedIndex()));
 		    d.pack();
 		    d.setVisible(true);
 		}
 	    });
 	}
-	
+
 	public String getDescription() {
 	    return ResourceStrings.getString("add_wiz_configure_desc");
 	}
-	
+
 	public Component getComponent() {
 	    return stepBox;
 	}
-	
+
 	public void setActive(int direction) {
 	    macroBox.setSelectedItem(macro);
 	    unusableBox.setSelected(unusable);
 	    setForwardEnabled(true);
 	}
-	
+
 	public boolean setInactive(int direction) {
 	    macro = (String)macroBox.getSelectedItem();
 	    unusable = unusableBox.isSelected();
 	    return true;
 	}
     }
-    
+
     // This step selects the lease type
     class LeaseStep implements WizardStep {
 	private Box stepBox;
 	private JRadioButton dynamicButton, permanentButton;
 	private ButtonGroup buttonGroup;
-	
+
 	public LeaseStep() {
 	    stepBox = Box.createVerticalBox();
-	    
+
 	    // Start with explanatory text
 	    JComponent component = Wizard.createTextArea(
 		ResourceStrings.getString("add_wiz_lease_explain"), 0, 45);
 	    component.setAlignmentX(Component.LEFT_ALIGNMENT);
 	    stepBox.add(component);
 	    stepBox.add(Box.createVerticalStrut(10));
-	    
+
 	    // User has choice of dynamic or permanent leases
 	    Mnemonic mnLease =
                 new Mnemonic(ResourceStrings.getString("add_wiz_lease_label"));
@@ -816,26 +746,26 @@
 	    stepBox.add(panel);
 	    stepBox.add(Box.createVerticalGlue());
 	}
-	
+
 	public String getDescription() {
 	    return ResourceStrings.getString("add_wiz_lease_desc");
 	}
-	
+
 	public Component getComponent() {
 	    return stepBox;
 	}
-	
+
 	public void setActive(int direction) {
 	    dynamicButton.setSelected(dynamic);
 	    setForwardEnabled(true);
 	}
-	
+
 	public boolean setInactive(int direction) {
 	    dynamic = dynamicButton.isSelected();
 	    return true;
 	}
     }
-    
+
     // Last chance to check work before committing to it
     class ReviewStep implements WizardStep {
 	private Box stepBox;
@@ -847,15 +777,15 @@
 	private JLabel macroLabel;
 	private JLabel flagLabel;
 	private JLabel leaseLabel;
-	
+
 	public ReviewStep() {
 	    stepBox = Box.createVerticalBox();
 	    stepBox.add(Wizard.createTextArea(
 		ResourceStrings.getString("add_wiz_review_explain"), 4, 45));
-	    
+
 	    panel = new JPanel(new FieldLayout());
 	    JLabel tmpL;
-	    
+
 	    tmpL = addLabelMnemonic("add_wiz_count_label");
 	    numberLabel = addField("20");
 	    tmpL.setLabelFor(numberLabel);
@@ -876,17 +806,17 @@
 	    flagLabel = addField("Yes");
 	    tmpL.setLabelFor(flagLabel);
 	    tmpL.setToolTipText(
-	        ResourceStrings.getString("add_wiz_review_unusable"));
-	    
+		ResourceStrings.getString("add_wiz_review_unusable"));
+
 	    tmpL = addLabelMnemonic("add_wiz_lease_label");
 	    leaseLabel = addField(ResourceStrings.getString("dynamic"));
 	    tmpL.setLabelFor(leaseLabel);
-	    
+
 	    panel.setAlignmentX(Component.LEFT_ALIGNMENT);
 	    stepBox.add(panel);
-	    
+
 	    stepBox.add(Box.createVerticalStrut(5));
-	   
+
 	    Mnemonic mnAdd =
                 new Mnemonic(ResourceStrings.getString(
 		    "add_wiz_confirm_label"));
@@ -912,9 +842,9 @@
 	    stepBox.add(scrollPane);
 	    stepBox.add(Box.createVerticalGlue());
 	}
-	
+
 	private JLabel addLabel(String s) {
-	    JLabel l = new JLabel(ResourceStrings.getString(s)); 
+	    JLabel l = new JLabel(ResourceStrings.getString(s));
 	    panel.add(FieldLayout.LABEL, l);
 	    return l;
 	}
@@ -927,22 +857,22 @@
             panel.add(FieldLayout.LABEL, l);
             return l;
         }
-	
+
 	private JLabel addField(String s) {
 	    JLabel l = new JLabel(s);
 	    l.setForeground(Color.black);
 	    panel.add(FieldLayout.FIELD, l);
 	    return l;
 	}
-	
+
 	public String getDescription() {
 	    return ResourceStrings.getString("add_wiz_review_desc");
 	}
-	
+
 	public Component getComponent() {
 	    return stepBox;
 	}
-	
+
 	public void setActive(int direction) {
 	    // Use number of addresses actually generated, not requested
 	    numberLabel.setText(
@@ -962,21 +892,21 @@
 	    }
 	    setFinishEnabled(true);
 	}
-	
+
 	public boolean setInactive(int direction) {
 	    // Nothing to do
 	    return true;
 	}
     }
-     
+
     public AddressWizard(Frame owner, Network net) {
 	super(owner, "");
 	setTitle(MessageFormat.format(
 	    ResourceStrings.getString("address_wizard_title"), net.toString()));
-	
+
 	network = net;
 	startAddress = network.getAddress();
-	
+
 	try {
 	    noMacro = new Macro(ResourceStrings.getString("no_macro_item"));
 	} catch (ValidationException e) {
@@ -994,7 +924,7 @@
 	addStep(new ReviewStep());
 	showFirstStep();
     }
-    
+
     public void doFinish() {
 	/*
 	 * Method here is as follows:
@@ -1036,7 +966,7 @@
 			rec.setMacro(macro);
 		}
 		rec.setComment(comment);
-		
+
 		// This is final so it can be used in the errorDisplay Runnable
 		final ErrorTable failedTable = new ErrorTable(
 		    ResourceStrings.getString("address_column"),
@@ -1052,12 +982,12 @@
 			rec.setClientIP(addr.addr);
 			rec.setClientName(addr.name);
 			server.addClient(rec, network.toString());
-		    	progress.update(i+1, addr.addr.toString());
+			progress.update(i+1, addr.addr.toString());
 		    } catch (InterruptedException e) {
-		        SwingUtilities.invokeLater(finisher);
+			SwingUtilities.invokeLater(finisher);
 			return;
 		    } catch (Throwable e) {
-		        // Pick the best message for the exception thrown
+			// Pick the best message for the exception thrown
 			String msg;
 			if (e instanceof ExistsException) {
 			    msg = ResourceStrings.getString("address_exists");
@@ -1069,33 +999,33 @@
 			failedTable.addError(addr.addr, msg);
 		    }
 		}
-			
+
 		// If any errors occurred, display them all at once.
 		if (!failedTable.isEmpty()) {
 		    Runnable errorDisplay = new Runnable() {
-		        public void run() {
+			public void run() {
 			    Object [] objs = new Object[2];
 			    objs[0] =
-			        ResourceStrings.getString("add_wiz_error");
+				ResourceStrings.getString("add_wiz_error");
 			    JScrollPane scrollPane =
-			        new JScrollPane(failedTable);
+				new JScrollPane(failedTable);
 			    // Resize the table to something kind of small
 			    Dimension d =
-			        failedTable.
+				failedTable.
 				getPreferredScrollableViewportSize();
 			    d.height = 80;
 			    failedTable.setPreferredScrollableViewportSize(d);
 			    objs[1] = scrollPane;
 			    JOptionPane.showMessageDialog(AddressWizard.this,
-			        objs,
-			        ResourceStrings.getString("server_error_title"),
-			        JOptionPane.ERROR_MESSAGE);
-		    	}
+				objs,
+				ResourceStrings.getString("server_error_title"),
+				JOptionPane.ERROR_MESSAGE);
+			}
 		    };
 		    try {
-		        SwingUtilities.invokeAndWait(errorDisplay);
+			SwingUtilities.invokeAndWait(errorDisplay);
 		    } catch (Throwable e) {
-		    	e.printStackTrace();
+			e.printStackTrace();
 		    }
 		}
 		SwingUtilities.invokeLater(finisher);
@@ -1103,7 +1033,7 @@
 	};
 	addThread.start();
     }
-    
+
     protected void reallyFinish() {
         super.doFinish();
     }

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/ConfigWizard.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/ConfigWizard.java	Sun Aug 15 15:22:57 2010 -0400
@@ -64,347 +64,6 @@
 	ResourceStrings.getString("cfg_wiz_days"),
 	ResourceStrings.getString("cfg_wiz_weeks") };
     private static final int [] unitMultiples = { 60*60, 24*60*60, 7*24*60*60 };
-    private HostResource hostResource = null;
-
-    /**
-     * This class defines a host resource component.
-     */
-    private class HostResource extends Box {
-
-	/**
-	 * The host resource(eg., files, dns).
-	 */
-	private String resource = null;
-
-	/**
-	 * The description of the resource.
-	 */
-	private String description = null;
-
-	/**
-	 * The button for the resource.
-	 */
-	private HostButton hostButton = null;
-
-	/**
-	 * The domain field for the resource (if any)
-	 */
-	private NoSpaceField domainField = null;
-
-	/**
-	 * The constructor.
-	 * @param resource the resource value for the config file
-	 * @param description description of the resource
-	 * @param defaultdomain default domain (if any) for the resource
-	 * @param enabled determines whether resource is selectable
-	 */
-	public HostResource(String resource, String description,
-	    String defaultDomain, String domainDescription, boolean enabled) {
-
-	    super(BoxLayout.X_AXIS);
-
-	    this.resource = resource;
-	    this.description = description;
-
-	    // Every host resource needs a button even if the resource
-	    // isn't one that will be selectable.
-	    //
-	    hostButton = new HostButton(this, false);
-	    hostButton.setAlignmentX(Component.LEFT_ALIGNMENT);
-	    add(hostButton);
-	    if (!enabled) {
-		hostButton.setEnabled(false);
-		defaultDomain = new String();
-	    }
-
-	    // If the defaultDomain is null, then the host resource
-	    // does not require a domain. Otherwise, the resource
-	    // must have a text field so that the user can supply
-	    // a domain.
-	    //
-	    if (defaultDomain != null) {
-		add(Box.createHorizontalStrut(20));
-
-		Box domainBox = Box.createHorizontalBox();
-
-		JLabel label = new JLabel(domainDescription);
-		label.setForeground(Color.black);
-		domainBox.add(label);
-
-		domainField = new NoSpaceField(defaultDomain, 10);
-		domainField.setEnabled(false);
-		domainField.setMaximumSize(domainField.getPreferredSize());
-
-		label.setLabelFor(domainField);
-		domainBox.add(domainField);
-		label.setToolTipText(description);
-
-		add(domainBox);
-
-		if (!enabled) {
-		    domainField.setEditable(false);
-		    label.setEnabled(false);
-		} else {
-		    // Disable the forward button if domain empty.
-		    DocumentListener listener = new DocumentListener() {
-			public void insertUpdate(DocumentEvent e) {
-			    setForwardEnabled(
-				domainField.getText().length() != 0);
-			}
-			public void changedUpdate(DocumentEvent e) {
-			    insertUpdate(e);
-			}
-			public void removeUpdate(DocumentEvent e) {
-			    insertUpdate(e);
-			}
-		    };
-		    domainField.getDocument().addDocumentListener(listener);
-		}
-
-	    }
-
-	} // constructor
-
-	/**
-	 * Sets or unsets the host resource.
-	 * @param isSelected if true, sets the resource, else unsets it
-	 */
-	public void setSelected(boolean isSelected) {
-	    if (isSelected) {
-		setHostResource(this);
-		if (!hostButton.isSelected()) {
-		    hostButton.setSelected(true);
-		}
-		if (domainField != null) {
-		    domainField.setEnabled(true);
-		    setForwardEnabled(domainField.getText().length() != 0);
-		} else {
-		    setForwardEnabled(true);
-		}
-	    } else {
-		if (domainField != null) {
-		    domainField.setEnabled(false);
-		}
-	    }
-	} // setSelected
-
-	/**
-	 * Returns the host resource.
-	 * @return the host resource.
-	 */
-	public String getResource() {
-	    return resource;
-	} // getResource
-
-	/**
-	 * Returns the resource description.
-	 * @return the resource description.
-	 */
-	public String getDescription() {
-	    return description;
-	} // getDescription
-
-	/**
-	 * Returns the domain for this component.
-	 * @return the domain for this component.
-	 */
-	public String getDomain() {
-	    if (domainField == null) {
-		return null;
-	    } else {
-		return domainField.getText();
-	    }
-	} // getDomain
-
-	/**
-	 * Returns the HostButton contained in this component.
-	 * @return the HostButton contained in this component.
-	 */
-	public HostButton getHostButton() {
-	    return hostButton;
-	} // getHostButton
-
-    } // hostResource
-
-    /**
-     * This class maps a radio button to its HostResource
-     */
-    private class HostButton extends JRadioButton {
-
-	/**
-	 * The HostResource to link to the radio button.
-	 */
-	private HostResource hostResource = null;
-
-	/**
-	 * Constructs a HostButton from a HostResource and determines
-	 * whether the button should be selected using the boolean argument.
-	 * @param hostResource the HostResource to map to the radio button.
-	 * @param selected select the radio button?
-	 */
-	public HostButton(HostResource hostResource, boolean selected) {
-	    super(hostResource.getDescription(), selected);
-	    this.hostResource = hostResource;
-	} // constructor
-
-	/**
-	 * Returns the HostResource mapped to the radio button.
-	 * @return the HostResource mapped to the radio button.
-	 */
-	public HostResource getHostResource() {
-	    return hostResource;
-	} // getHostResource
-
-    } // HostButton
-
-    // Select where host data will be stored.
-    class HostDataStep implements WizardStep {
-
-	/**
-	 * The component provided to the wizard.
-	 */
-	private Box stepBox;
-
-	/**
-	 * The basic constructor for the wizard step.
-	 */
-	public HostDataStep() {
-
-	    stepBox = Box.createVerticalBox();
-
-	    // Explanatory step text
-	    //
-	    JComponent c = Wizard.createTextArea(
-		ResourceStrings.getString("cfg_wiz_host_explain"), 2, 45);
-	    c.setAlignmentX(Component.LEFT_ALIGNMENT);
-	    stepBox.add(c);
-	    stepBox.add(Box.createVerticalStrut(5));
-
-	    // Create button listener, that will set the selected
-	    // host resource when the button is selected.
-	    //
-	    ChangeListener buttonListener = new ChangeListener() {
-		public void stateChanged(ChangeEvent e) {
-		    HostButton button = (HostButton)e.getSource();
-		    HostResource hostResource = button.getHostResource();
-		    hostResource.setSelected(button.isSelected());
-		}
-	    };
-
-	    // Create panel that will contain the buttons.
-	    //
-	    JPanel boxPanel = new JPanel();
-	    boxPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
-	    boxPanel.setLayout(new GridLayout(4, 1));
-
-	    // List the host resource choices.
-	    //
-	    ButtonGroup buttonGroup = new ButtonGroup();
-
-	    // The "do not manage hosts" option.
-	    //
-	    String hostDescription =
-		ResourceStrings.getString("cfg_wiz_no_host_management");
-	    HostResource hostResource = new HostResource(null,
-		hostDescription, null, null, true);
-	    HostButton hbMgt = hostResource.getHostButton();
-            hbMgt.setToolTipText(hostDescription);
-	    hostResource.setSelected(true);
-	    hostResource.getHostButton().addChangeListener(buttonListener);
-	    buttonGroup.add(hostResource.getHostButton());
-	    boxPanel.add(hostResource);
-
-	    // The "files" option.
-	    //
-	    hostDescription =
-		ResourceStrings.getString("cfg_wiz_files");
-	    hostResource = new HostResource(DhcpConfigOpts.DSVC_CV_FILES,
-		hostDescription, null, null, true);
-	    HostButton hb = hostResource.getHostButton();
-	    hb.setToolTipText(hostDescription);
-	    hostResource.getHostButton().addChangeListener(buttonListener);
-	    buttonGroup.add(hostResource.getHostButton());
-	    boxPanel.add(hostResource);
-
-	    // The "dns" option. Only enabled if it can be managed
-	    // from the selected server.
-	    //
-	    String domainDefault = null;
-	    boolean enabled = false;
-	    String domainDescription =
-		ResourceStrings.getString("cfg_wiz_domain") + " ";
-	    try {
-		domainDefault =
-		    server.getStringOption(StandardOptions.CD_DNSDOMAIN, "");
-	    } catch (Throwable e) {
-		domainDefault = new String();
-	    }
-
-	    try {
-		enabled =
-		    server.isHostsValid(DhcpConfigOpts.DSVC_CV_DNS, "");
-	    } catch (Throwable e) {
-		enabled = false;
-	    }
-
-	    hostDescription =
-		ResourceStrings.getString("cfg_wiz_dns");
-
-	    hostResource = new HostResource(DhcpConfigOpts.DSVC_CV_DNS,
-		hostDescription, domainDefault, domainDescription, enabled);
-	    HostButton hbDNS = hostResource.getHostButton();
-            hbDNS.setToolTipText(hostDescription);
-	    hostResource.getHostButton().addChangeListener(buttonListener);
-	    buttonGroup.add(hostResource.getHostButton());
-	    boxPanel.add(hostResource);
-
-	    // Add the panel to the stepBox component.
-	    //
-	    stepBox.add(boxPanel);
-	    stepBox.add(Box.createVerticalStrut(10));
-	    stepBox.add(Box.createVerticalGlue());
-
-	} // constructor
-
-	public String getDescription() {
-	    return ResourceStrings.getString("cfg_wiz_hostdata_desc");
-	} // getDescription
-
-	public Component getComponent() {
-	    return stepBox;
-	} // getComponent
-
-	public void setActive(int direction) {
-	    setForwardEnabled(true);
-	} // setActive
-
-	public boolean setInactive(int direction) {
-
-	    // If moving forward, validate that the host resource/domain
-	    // input by the user is manageable from the selected server.
-	    //
-	    boolean valid = true;
-	    if (direction == FORWARD) {
-		String resource = getHostResource().getResource();
-		String domain = getHostResource().getDomain();
-		if (resource != null) {
-		    try {
-			valid = server.isHostsValid(resource, domain);
-		    } catch (Throwable e) {
-			valid = false;
-		    }
-		}
-		if (!valid) {
-		    JOptionPane.showMessageDialog(ConfigWizard.this,
-			ResourceStrings.getString("cfg_wiz_invalid_host"),
-			ResourceStrings.getString("input_error"),
-			JOptionPane.ERROR_MESSAGE);
-		}
-	    }
-	    return (valid);
-	} // setInactive
-
-    } // HostDataStep
 
     // This step specifies lease length and renewal policies for the server
     class LeaseStep implements WizardStep {
@@ -1161,7 +820,6 @@
 
     class ReviewStep implements WizardStep {
 	private JLabel storeLabel;
-	private JLabel hostLabel;
 	private JLabel leaseLabel;
 	private JLabel networkLabel;
 	private JLabel netTypeLabel;
@@ -1193,9 +851,6 @@
 		addLabel("cfg_wiz_datastore");
 		storeLabel = addField("uninitialized");
 
-		addLabel("cfg_wiz_hosts_resource");
-		hostLabel = addField("uninitialized");
-
 		jlTmp = addLabelMnemonic("cfg_wiz_lease_length");
 		leaseLabel = addField("1 day");
 
@@ -1276,7 +931,6 @@
 	    setFinishEnabled(true);
 	    if (fullConfig) {
 		storeLabel.setText(getDsconf().getModule().getDescription());
-		hostLabel.setText(getHostResource().getDescription());
 
 		// Display lease length, reducing to largest units possible
 		int lengthVal = 0;
@@ -1378,7 +1032,6 @@
 		ResourceStrings.getString("cfg_wiz_explain"),
 		ResourceStrings.getString("cfg_wiz_store_explain")));
 	    addStep(new DatastoreModuleStep());
-	    addStep(new HostDataStep());
 	    addStep(new LeaseStep());
 	    addStep(new DnsStep());
 	}
@@ -1428,12 +1081,6 @@
 	    DhcpdOptions options = new DhcpdOptions();
 	    options.setDaemonEnabled(true);
 	    options.setDhcpDatastore(getDsconf().getDS());
-	    if (getHostResource().getResource() != null) {
-		options.setHostsResource(getHostResource().getResource());
-	    }
-	    if (getHostResource().getDomain() != null) {
-		options.setHostsDomain(getHostResource().getDomain());
-	    }
 	    try {
 		server.writeDefaults(options);
 	    } catch (Throwable e) {
@@ -1537,21 +1184,4 @@
 	    DhcpmgrApplet.showHelp("network_wizard");
 	}
     }
-
-    /**
-     * Sets hostResource.
-     * @param hostResource the host resource value.
-     */
-    public void setHostResource(HostResource hostResource) {
-	this.hostResource = hostResource;
-    } // setHostResource
-
-    /**
-     * Returns the hostResource.
-     * @return the hostResource.
-     */
-    public HostResource getHostResource() {
-	return hostResource;
-    } // getHostResource
-
 }

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/ConvertWizard.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/ConvertWizard.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 by Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -120,7 +118,7 @@
             saveTables = new JCheckBox(
                 ResourceStrings.getString("cvt_wiz_save_label"), false);
 	    saveTables.setToolTipText(
-	        ResourceStrings.getString("cvt_wiz_save_label"));
+		ResourceStrings.getString("cvt_wiz_save_label"));
             saveTables.setAlignmentX(Component.LEFT_ALIGNMENT);
             stepBox.add(saveTables);
             stepBox.add(Box.createVerticalGlue());
@@ -193,7 +191,7 @@
 	    stepBox.add(Wizard.createTextArea(
 		ResourceStrings.getString("cvt_wiz_review_explain"),
 		    3, 45));
-	    
+
 	    panel = new JPanel(new FieldLayout());
 
 	    addLabel("cvt_wiz_old_datastore").setToolTipText(
@@ -223,12 +221,12 @@
 	 * @param s the label string.
 	 */
 	private JLabel addLabel(String s) {
-	    JLabel addLbl = 
+	    JLabel addLbl =
 		new JLabel(ResourceStrings.getString(s));
 	    panel.add(FieldLayout.LABEL, addLbl);
 	    return addLbl;
 	} // addLabel
-	
+
 	/**
 	 * Adds a field to the review panel.
 	 * @param s the field value.
@@ -240,15 +238,15 @@
 	    panel.add(FieldLayout.FIELD, l);
 	    return l;
 	} // addField
-	
+
 	public String getDescription() {
 	    return ResourceStrings.getString("cvt_wiz_review_desc");
 	} // getDescription
-	
+
 	public Component getComponent() {
 	    return stepBox;
 	} // getComponent
-	
+
 	public void setActive(int direction) {
 
 	    setFinishEnabled(true);
@@ -274,17 +272,17 @@
 		message = ResourceStrings.getString("no");
 	    }
 	    saveLabel.setText(message);
-	    
+
 	} // setActive
-	
+
 	public boolean setInactive(int direction) {
 	    return true;
 	} // setInactive
 
     } // ReviewStep
-    
+
     /**
-     * Constructor for the ConvertWizard. 
+     * Constructor for the ConvertWizard.
      * @param owner owner of the wizard.
      * @param title title of the wizard.
      */
@@ -343,7 +341,7 @@
 	addStep(new ReviewStep());
 	showFirstStep();
     }
-    
+
     public void doFinish() {
 	/*
 	 * To convert the data store, we have to do the following items:
@@ -438,7 +436,7 @@
 	//
 	Thread convertThread = new Thread() {
 	    public void run() {
-	
+
 		String message = null;
 		MessageFormat form;
 		MessageFormat errForm;
@@ -446,7 +444,7 @@
 		boolean saveTables =
 		    saveTablesStep.isSaveTablesSelected();
 
-		// This is final so it can be used in the 
+		// This is final so it can be used in the
 		// errorDisplay Runnable.
 		//
 		final ErrorTable failedTable = new ErrorTable(
@@ -556,7 +554,7 @@
 			String netString = networks[i].toString();
 			args[0] = netString;
 			try {
-			    netServer.deleteNetwork(netString, false, false,
+			    netServer.deleteNetwork(netString, false,
 				oldDhcpDatastore);
 			    message = form.format(args);
 			} catch (Throwable e) {
@@ -609,7 +607,7 @@
 			message = ResourceStrings.getString(
 			    "cvt_wiz_server_started");
 		    } catch (Throwable e) {
-		        message =
+			message =
 			    ResourceStrings.getString("cvt_wiz_start_err");
 			failedTable.addError("", e.getMessage());
 		    } finally {
@@ -645,12 +643,12 @@
 				objs,
 				ResourceStrings.getString("server_error_title"),
 				JOptionPane.ERROR_MESSAGE);
-		    	}
+			}
 		    };
 		    try {
 			SwingUtilities.invokeAndWait(errorDisplay);
 		    } catch (Throwable e) {
-		    	e.printStackTrace();
+			e.printStackTrace();
 		    }
 		}
 		SwingUtilities.invokeLater(finisher);
@@ -658,7 +656,7 @@
 	};
 	convertThread.start();
     }
-    
+
     public void doHelp() {
 	DhcpmgrApplet.showHelp("convert_wizard");
     }

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/CreateAddressDialog.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/CreateAddressDialog.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 1998-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -58,11 +56,11 @@
 	private Object currentValue;
 	private Macro [] data = null;
 	private String noMacro;
-	
+
 	public MacroListModel() {
 	    try {
 		noMacro = ResourceStrings.getString("no_macro_item");
-	        DhcptabMgr server = DataManager.get().getDhcptabMgr();
+		DhcptabMgr server = DataManager.get().getDhcptabMgr();
 		data = server.getMacros();
 	    } catch (NoTableException e) {
 		// can function without table
@@ -70,14 +68,14 @@
 		e.printStackTrace();
 	    }
 	}
-	
+
 	public int getSize() {
 	    if (data == null)
 		return 1;
 	    else
 		return data.length+1;
 	}
-	
+
 	public Object getElementAt(int index) {
 	    if (index == 0) {
 		return noMacro;
@@ -85,12 +83,12 @@
 		return data[index-1].getKey();
 	    }
 	}
-	
+
 	public void setSelectedItem(Object anItem) {
 	    currentValue = anItem;
 	    fireContentsChanged(this, -1, -1);
 	}
-	
+
 	public Object getSelectedItem() {
 	    return currentValue;
 	}
@@ -99,11 +97,10 @@
     public static final int CREATE = 0;
     public static final int EDIT = 1;
     public static final int DUPLICATE = 2;
-    
+
     private int mode = EDIT;
     private Network network;
     private IPAddressField address;
-    private HostnameField name;
     private JTextField server;
     private JComboBox macro;
     private JTextField clientId;
@@ -120,7 +117,7 @@
     private Vector listeners;
     private DateFormat dateFormat =
 	DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-    
+
     public CreateAddressDialog(Frame f, int mode, DhcpClientRecord rec,
 	    Network net) {
 	super(f);
@@ -142,11 +139,11 @@
 	default:
 	    break;
 	}
-	
+
 	getContentPane().setLayout(new BorderLayout());
-	
+
 	JTabbedPane tabbedPane = new JTabbedPane();
-	
+
 	GridBagLayout bag = new GridBagLayout();
 	JPanel mainPanel = new JPanel(bag);
 	GridBagConstraints c = new GridBagConstraints();
@@ -155,7 +152,7 @@
 	c.fill = GridBagConstraints.HORIZONTAL;
 	c.insets = new Insets(5, 5, 5, 5);
 	c.weightx = c.weighty = 1.0;
-	
+
 	// Label and text field for address
 	Mnemonic mnIP =
             new Mnemonic(ResourceStrings.getString("ip_address_label"));
@@ -173,35 +170,6 @@
 	++c.gridx;
 	bag.setConstraints(address, c);
 	mainPanel.add(address);
-	
-	// Label and text field for name
-	Mnemonic mnClient =
-            new Mnemonic(ResourceStrings.getString("hostname_label"));
-        l = new JLabel(mnClient.getString(), SwingConstants.RIGHT);
-        ++c.gridy;
-        c.gridx = 0;
-        bag.setConstraints(l, c);
-        mainPanel.add(l);
-        name = new HostnameField();
-
-        l.setLabelFor(name);
-        l.setToolTipText(mnClient.getString());
-	l.setDisplayedMnemonic(mnClient.getMnemonic());
-
-	++c.gridx;
-	bag.setConstraints(name, c);
-	mainPanel.add(name);
-	
-	name.setEditable(true);
-	try {
-	    DhcpdOptions opts =
-	    DataManager.get().getDhcpServiceMgr().readDefaults();
-	    if (opts.getHostsResource() == null) {
-		name.setEditable(false);
-	    }
-	} catch (BridgeException e) {
-	    // Assume set
-	}
 
 	// label and field for owning server
 	Mnemonic mnOwn =
@@ -220,7 +188,7 @@
 	++c.gridx;
 	bag.setConstraints(server, c);
 	mainPanel.add(server);
-	
+
 	// label and combo box for macro
 	Mnemonic mnMacro =
             new Mnemonic(ResourceStrings.getString("config_macro_label"));
@@ -240,7 +208,7 @@
 	++c.gridx;
 	bag.setConstraints(macro, c);
 	mainPanel.add(macro);
-	
+
 	// Comment
 	Mnemonic mnComm =
             new Mnemonic(ResourceStrings.getString("comment_label"));
@@ -258,13 +226,13 @@
 	++c.gridx;
 	bag.setConstraints(comment, c);
 	mainPanel.add(comment);
-	
+
 	// Create first panel of tabs
 	tabbedPane.addTab(ResourceStrings.getString("address_tab_label"),
 	    mainPanel);
-	
+
 	mainPanel = new JPanel(new BorderLayout(5, 5));
-	
+
 	// Client ID
 	Mnemonic mnID =
             new Mnemonic(ResourceStrings.getString("client_id_label"));
@@ -277,14 +245,14 @@
         l.setToolTipText(mnID.getString());
 	l.setDisplayedMnemonic(mnID.getMnemonic());
 	idPanel.add(clientId);
-	
+
 	manual = new JCheckBox(ResourceStrings.getString("manual_checkbox"));
 	idPanel.add(manual);
 	manual.setToolTipText(
 	    ResourceStrings.getString("manual_checkbox"));
 
 	mainPanel.add(idPanel, BorderLayout.NORTH);
-	
+
 	// radio buttons for lease state
 	bag = new GridBagLayout();
 	JPanel leasePanel = new JPanel(bag);
@@ -297,11 +265,11 @@
 	    BorderFactory.createLineBorder(Color.black));
 	leasePanel.setBorder(BorderFactory.createTitledBorder(b,
 	    ResourceStrings.getString("lease_policy_label")));
-	
+
 	// Reset constraints
 	c.gridx = c.gridy = 0;
 	c.gridwidth = 1;
-	
+
 	buttonGroup = new ButtonGroup();
 	temporary = new JRadioButton();
 	buttonGroup.add(temporary);
@@ -316,7 +284,7 @@
 	c.weightx = 1.0;
 	bag.setConstraints(l, c);
 	leasePanel.add(l);
-	
+
 	expirationDate = new JTextField(30);
 
         l.setLabelFor(expirationDate);
@@ -326,7 +294,7 @@
 	++c.gridy;
 	bag.setConstraints(expirationDate, c);
 	leasePanel.add(expirationDate);
-	
+
 	permanent = new JRadioButton();
 	buttonGroup.add(permanent);
 	++c.gridy;
@@ -348,43 +316,43 @@
 	leasePanel.add(l);
 
 	mainPanel.add(leasePanel, BorderLayout.CENTER);
-		
+
 	// Flag checkboxes
 	JPanel southPanel = new JPanel(new BorderLayout(5, 5));
 	southPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
 	bootp = new JCheckBox(ResourceStrings.getString("bootp_checkbox"));
 
 	bootp.setToolTipText(
-	    ResourceStrings.getString("bootp_checkbox")); 
+	    ResourceStrings.getString("bootp_checkbox"));
 
 	bootp.setHorizontalAlignment(SwingConstants.LEFT);
 	southPanel.add(bootp, BorderLayout.CENTER);
-	
+
 	unusable = new JCheckBox(
 	    ResourceStrings.getString("unusable_checkbox"));
 
         unusable.setToolTipText(
-            ResourceStrings.getString("unusable_checkbox"));            
+            ResourceStrings.getString("unusable_checkbox"));
 
 	unusable.setHorizontalAlignment(SwingConstants.LEFT);
 	southPanel.add(unusable, BorderLayout.SOUTH);
-	
+
 	mainPanel.add(southPanel, BorderLayout.SOUTH);
-	
+
 	tabbedPane.addTab(ResourceStrings.getString("lease_tab_label"),
 	    mainPanel);
 	JPanel borderPanel = new JPanel(new BorderLayout());
 	borderPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 	borderPanel.add(tabbedPane, BorderLayout.CENTER);
-	
+
 	getContentPane().add(borderPanel, BorderLayout.CENTER);
-	
+
 	buttonPanel = new ButtonPanel(true);
 	buttonPanel.addButtonPanelListener(this);
 	getContentPane().add(buttonPanel, BorderLayout.SOUTH);
-	
+
 	setClient(rec);
-	
+
 	DocumentListener docListener = new DocumentListener() {
 	    public void insertUpdate(DocumentEvent e) {
 		buttonPanel.setOkEnabled(address.getDocument().getLength() != 0
@@ -400,32 +368,23 @@
 
 	address.getDocument().addDocumentListener(docListener);
 	server.getDocument().addDocumentListener(docListener);
-	
+
 	if (mode == EDIT) {
 	    buttonPanel.setOkEnabled(true);
 	}
     }
-    
+
     public void setClient(DhcpClientRecord c) {
 	originalClient = (DhcpClientRecord)c.clone();
 	client = c;
 	resetValues();
     }
-    
+
     private void resetValues() {
 	if (mode == DUPLICATE) {
 	    address.setText("");
-	    name.setText("");
 	} else {
-	    String a = client.getClientIPAddress();
-	    String n = client.getClientName();
-	    address.setText(a);
-	    if (a.equals(n)) {
-		// If name == address, there is no name, so leave it blank
-		name.setText("");
-	    } else {
-		name.setText(n);
-	    }
+	    address.setText(client.getClientIPAddress());
 	}
 	if (mode == CREATE && (client.getServerName() == null ||
 		client.getServerName().length() == 0)) {
@@ -455,14 +414,14 @@
 	    expirationDate.setText(dateFormat.format(d));
 	}
     }
-    
+
     public void buttonPressed(int buttonId) {
 	switch (buttonId) {
 	case OK:
 	    IPAddress addr = address.getValue();
 	    if (addr == null) {
-	    	// Bad IP address
-	        MessageFormat form = new MessageFormat(
+		// Bad IP address
+		MessageFormat form = new MessageFormat(
 		    ResourceStrings.getString("invalid_address"));
 		Object [] args = new Object[] { address.getText() };
 		JOptionPane.showMessageDialog(this, form.format(args),
@@ -471,7 +430,7 @@
 		return;
 	    }
 	    if (!network.containsAddress(addr)) {
-	    	// Address is not on the network we're editing
+		// Address is not on the network we're editing
 		MessageFormat form = new MessageFormat(
 		    ResourceStrings.getString("bad_network_address"));
 		Object [] args = new Object[] {
@@ -484,23 +443,11 @@
 		return;
 	    }
 	    try {
-	    	client.setClientIP(address.getValue());
+		client.setClientIP(address.getValue());
 	    } catch (ValidationException e) {
-	        // This shouldn't happen, should have caught any problem already
+		// This shouldn't happen, should have caught any problem already
 	    }
 
-	    // This logic is needed because if the original client name
-	    // was equal to its IP address, then this really means that
-	    // that the name was not set. If this is the case and the
-	    // name field is empty, then no change was made. In all other
-	    // cases we can be assured that the client name was changed
-	    // or is valid.
-	    //
-	    if (!(name.getText().length() == 0 &&
-		originalClient.getClientIPAddress().equals(
-		originalClient.getClientName()))) {
-		client.setClientName(name.getText());
-	    }
 	    try {
 		if (!server.getText().equals(client.getServerName())) {
 		    // Don't bother resetting if it hasn't changed
@@ -508,7 +455,7 @@
 		}
 	    } catch (ValidationException e) {
 		// Bad server name
-	        MessageFormat form = new MessageFormat(
+		MessageFormat form = new MessageFormat(
 		    ResourceStrings.getString("invalid_server"));
 		Object [] args = new Object[] { server.getText() };
 		JOptionPane.showMessageDialog(this, form.format(args),
@@ -524,10 +471,10 @@
 	    }
 	    client.setComment(comment.getText());
 	    try {
-	    	client.setClientId(clientId.getText());
+		client.setClientId(clientId.getText());
 	    } catch (ValidationException e) {
-	    	// Bad client ID
-	        MessageFormat form = new MessageFormat(
+		// Bad client ID
+		MessageFormat form = new MessageFormat(
 		    ResourceStrings.getString("invalid_client_id"));
 		Object [] args = new Object[] { clientId.getText() };
 		JOptionPane.showMessageDialog(this, form.format(args),
@@ -547,8 +494,8 @@
 		    client.setExpiration(d);
 		}
 	    } catch (ParseException e) {
-	    	// Bad date/time entered
-	    	MessageFormat form = new MessageFormat(
+		// Bad date/time entered
+		MessageFormat form = new MessageFormat(
 		    ResourceStrings.getString("invalid_date"));
 		Object [] args = new Object[] {
 		    expirationDate.getText(),
@@ -564,7 +511,7 @@
 		DhcpNetMgr server = DataManager.get().getDhcpNetMgr();
 		if (mode == EDIT) {
 		    server.modifyClient(originalClient, client,
-		        network.toString());
+			network.toString());
 		} else {
 		    server.addClient(client, network.toString());
 		}
@@ -623,15 +570,15 @@
 	    break;
 	}
     }
-    
+
     public void addActionListener(ActionListener l) {
 	listeners.addElement(l);
     }
-    
+
     public void removeActionListener(ActionListener l) {
 	listeners.removeElement(l);
     }
-    
+
     protected void fireActionPerformed() {
 	String command = null;
 	switch (mode) {

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/DeleteAddressDialog.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/DeleteAddressDialog.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 1998-2002 by Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -44,10 +42,9 @@
  */
 
 public class DeleteAddressDialog extends MultipleOperationDialog {
-    private JCheckBox hostsBox;
     private DhcpClientRecord [] recs;
     private String table;
-    
+
     // Model for the list of addresses to be deleted
     class AddressTableModel extends AbstractTableModel {
 	public int getRowCount() {
@@ -57,11 +54,11 @@
 		return recs.length;
 	    }
 	}
-	
+
 	public int getColumnCount() {
 	    return 2;
 	}
-	
+
 	public Object getValueAt(int row, int column) {
 	    if (column == 0) {
 		return recs[row].getClientIP();
@@ -75,7 +72,7 @@
 		}
 	    }
 	}
-	    
+
 	public Class getColumnClass(int column) {
 	    if (column == 0) {
 		return IPAddress.class;
@@ -91,8 +88,8 @@
 		return ResourceStrings.getString("client_name_column");
 	    }
 	}
-    }    
-    
+    }
+
     public DeleteAddressDialog(Frame f, DhcpClientRecord [] clients,
 	    String table) {
 	// Create the dialog without a reset button
@@ -100,7 +97,7 @@
 	recs = clients;
 	this.table = table;
     }
-    
+
     public String getTitle() {
 	return ResourceStrings.getString("delete_address_title");
     }
@@ -108,7 +105,7 @@
     protected JPanel getMainPanel() {
 	JPanel mainPanel = new JPanel(new BorderLayout(10, 10));
 	mainPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-	
+
 	// Place a message at the top of the display
 	JLabel message = new JLabel(
 	    ResourceStrings.getString("delete_address_confirm"));
@@ -118,7 +115,7 @@
 	    ResourceStrings.getString("delete_address_confirm"));
 
 	mainPanel.add(message, BorderLayout.NORTH);
-	
+
 	// Now show the list of addresses to be deleted in a table in the middle
 	JTable addressTable = new JTable(new AddressTableModel());
 	JScrollPane scrollPane = new JScrollPane(addressTable);
@@ -128,27 +125,6 @@
 	addressTable.setDefaultRenderer(IPAddress.class,
 	    new ExtendedCellRenderer());
 	mainPanel.add(scrollPane, BorderLayout.CENTER);
-	
-	// Allow user to specify if hosts records will be deleted, too
-	hostsBox = new JCheckBox(
-	    ResourceStrings.getString("delete_hosts_checkbox"), true);
-	hostsBox.setToolTipText(
-	    ResourceStrings.getString("delete_hosts_checkbox"));
-
-	hostsBox.setHorizontalAlignment(SwingConstants.CENTER);
-	mainPanel.add(hostsBox, BorderLayout.SOUTH);
-
-	hostsBox.setEnabled(true);
-	try {
-	    DhcpdOptions opts =
-	    DataManager.get().getDhcpServiceMgr().readDefaults();
-	    if (opts.getHostsResource() == null) {
-		hostsBox.setEnabled(false);
-		hostsBox.setSelected(false);
-	    }
-	} catch (BridgeException e) {
-	    // Assume set
-	}
 
 	buttonPanel.setOkEnabled(true);
 	return mainPanel;
@@ -175,24 +151,16 @@
         return new Thread() {
 	    public void run() {
 		DhcpNetMgr server = DataManager.get().getDhcpNetMgr();
-		boolean deleteHosts = hostsBox.isSelected();
 		for (int i = 0; i < recs.length; ++i) {
 		    try {
-			server.deleteClient(recs[i], table, deleteHosts);
+			server.deleteClient(recs[i], table);
 			updateProgress(i+1, recs[i].getClientIPAddress());
 		    } catch (InterruptedException e) {
 			// User asked us to stop
 			closeDialog();
 			return;
 		    } catch (Throwable e) {
-			if (e.getMessage().equals("hosts")) {
-			    // Failure was in deleting hosts entry
-			    addError(recs[i].getClientIP(),
-				ResourceStrings.getString(
-				    "hosts_entry_missing"));
-			} else {
-			    addError(recs[i].getClientIP(), e.getMessage());
-			}
+                        addError(recs[i].getClientIP(), e.getMessage());
 		    }
 		}
 		// Errors occurred, display them
@@ -200,7 +168,7 @@
 		    displayErrors(
 			ResourceStrings.getString("delete_address_error"));
 		}
-	    	closeDialog();
+		closeDialog();
 	    }
 	};
     }
@@ -208,7 +176,7 @@
     protected String getHelpKey() {
 	return "delete_address";
     }
-    
+
     protected void fireActionPerformed() {
 	fireActionPerformed(this, DialogActions.DELETE);
     }

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/DeleteNetworksDialog.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/DeleteNetworksDialog.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 1998-2002 by Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -46,19 +44,19 @@
  * A dialog to remove one or more networks from the DHCP configuration.
  */
 public class DeleteNetworksDialog extends MultipleOperationDialog {
-    
+
     class NetworkListModel extends AbstractListModel {
 	private Vector networks;
-	
+
 	public NetworkListModel() {
 	    networks = new Vector();
 	}
-	
+
 	public void setNetworks(Network [] nets) {
 	    networks.removeAllElements();
 	    addNetworks(nets);
 	}
-	
+
 	public void addNetworks(Object [] nets) {
 	    if (nets != null) {
 		for (int i = 0; i < nets.length; ++i) {
@@ -67,28 +65,27 @@
 	    }
 	    fireContentsChanged(this, 0, networks.size()-1);
 	}
-	
+
 	public void deleteNetworks(Object [] nets) {
 	    for (int i = 0; i < nets.length; ++i) {
 		networks.removeElement((Network)nets[i]);
 	    }
 	    fireContentsChanged(this, 0, networks.size()-1);
 	}
-	
+
 	public Object getElementAt(int index) {
 	    return networks.elementAt(index);
 	}
-	
+
 	public int getSize() {
 	    return networks.size();
-	}	
+	}
     }
-    
+
     private JList keepNets, deleteNets;
-    private JCheckBox deleteHosts;
     private LeftButton leftButton;
     private RightButton rightButton;
-    
+
     public DeleteNetworksDialog(Frame f) {
 	// We want a reset button
 	super(f, true);
@@ -101,7 +98,7 @@
     protected JPanel getMainPanel() {
 	JPanel mainPanel = new JPanel(new BorderLayout());
 	mainPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-		
+
 	JPanel netBox = new JPanel(new ProportionalLayout());
 	JPanel panel = new JPanel(new BorderLayout(5, 5));
 
@@ -119,7 +116,7 @@
 	JScrollPane scrollPane = new JScrollPane(keepNets);
 	panel.add(scrollPane, BorderLayout.CENTER);
 	netBox.add("2", panel);
-	
+
 	panel = new JPanel(new VerticalButtonLayout());
 	leftButton = new LeftButton();
 	rightButton = new RightButton();
@@ -128,7 +125,7 @@
 	panel.add(rightButton);
 	panel.add(leftButton);
 	netBox.add("1", panel);
-	
+
 	panel = new JPanel(new BorderLayout(5, 5));
 
 	Mnemonic mnDel =
@@ -147,29 +144,9 @@
 	scrollPane = new JScrollPane(deleteNets);
 	panel.add(scrollPane, BorderLayout.CENTER);
 	netBox.add("2", panel);
-	
-	mainPanel.add(netBox, BorderLayout.CENTER);
-	
-	deleteHosts = new JCheckBox(
-	    ResourceStrings.getString("delete_networks_delete_hosts"));
-	deleteHosts.setToolTipText(
-	    ResourceStrings.getString("delete_networks_delete_hosts"));
-
-	panel = new JPanel();
-	panel.add(deleteHosts);
-	mainPanel.add(panel, BorderLayout.SOUTH);
 
-	deleteHosts.setEnabled(true);
-	try {
-	    DhcpdOptions opts =
-	    DataManager.get().getDhcpServiceMgr().readDefaults();
-	    if (opts.getHostsResource() == null) {
-		deleteHosts.setEnabled(false);		
-	    }
-	} catch (BridgeException e) {
-	    // Assume set
-	}
-	
+	mainPanel.add(netBox, BorderLayout.CENTER);
+
 	// Handle enable and disable of buttons based on selection state
 	keepNets.addListSelectionListener(new ListSelectionListener() {
 	    public void valueChanged(ListSelectionEvent e) {
@@ -179,7 +156,7 @@
 		}
 	    }
 	});
-	
+
 	deleteNets.addListSelectionListener(new ListSelectionListener() {
 	    public void valueChanged(ListSelectionEvent e) {
 		leftButton.setEnabled(!deleteNets.isSelectionEmpty());
@@ -188,7 +165,7 @@
 		}
 	    }
 	});
-	
+
 	// Handle button presses
 	rightButton.addActionListener(new ActionListener() {
 	    public void actionPerformed(ActionEvent e) {
@@ -205,7 +182,7 @@
 		keepNets.clearSelection();
 	    }
 	});
-	
+
 	leftButton.addActionListener(new ActionListener() {
 	    public void actionPerformed(ActionEvent e) {
 		Object [] nets = deleteNets.getSelectedValues();
@@ -226,11 +203,10 @@
 
 	return mainPanel;
     }
-    
+
     protected void doReset() {
 	try {
 	    buttonPanel.setOkEnabled(false);
-	    deleteHosts.setSelected(false);
 	    ((NetworkListModel)deleteNets.getModel()).setNetworks(null);
 	    ((NetworkListModel)keepNets.getModel()).setNetworks(
 		DataManager.get().getNetworks(false));
@@ -247,7 +223,7 @@
     protected int getProgressLength() {
         return deleteNets.getModel().getSize();
     }
-    
+
     protected String getErrorHeading() {
     	return ResourceStrings.getString("network_column");
     }
@@ -255,13 +231,13 @@
     protected Thread getOperationThread() {
     	return new Thread() {
 	    public void run() {
-	        NetworkListModel model =
+		NetworkListModel model =
 		    (NetworkListModel)deleteNets.getModel();
 		for (int i = 0; i < model.getSize(); ++i) {
 		    Network net = (Network)model.getElementAt(i);
 		    try {
 			DataManager.get().getDhcpNetMgr().deleteNetwork(
-			    net.toString(), true, deleteHosts.isSelected());
+			    net.toString(), true);
 			updateProgress(i+1, net.toString());
 		    } catch (InterruptedException e) {
 			// User asked us to stop
@@ -273,7 +249,7 @@
 		}
 		if (errorsOccurred()) {
 		    displayErrors(
-		        ResourceStrings.getString("delete_networks_error"));
+			ResourceStrings.getString("delete_networks_error"));
     		}
 		closeDialog();
 	    }
@@ -283,7 +259,7 @@
     protected String getHelpKey() {
     	return "delete_network";
     }
-    
+
     protected void fireActionPerformed() {
 	fireActionPerformed(this, DialogActions.OK);
     }

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/ResourceBundle.properties	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/ResourceBundle.properties	Sun Aug 15 15:22:57 2010 -0400
@@ -247,7 +247,6 @@
 address_tab_label=Address
 lease_tab_label=Lease
 ip_address_label=&IP Address:
-hostname_label=C&lient Name:
 owning_server_label=O&wned by Server:
 config_macro_label=Configuration &Macro:
 client_id_label=C&lient ID:
@@ -265,8 +264,6 @@
 #
 delete_address_title=Delete Address
 delete_address_confirm=OK to delete the following addresses?
-delete_hosts_checkbox=Delete from hosts table
-hosts_entry_missing=No entry was found in the server's hosts table, address was not deleted.
 
 delete_address_error=The following errors occurred while deleting addresses:
 delete_addr_progress=Deleting address:
@@ -290,9 +287,6 @@
 add_wiz_server_label=&Managed by Server:
 add_wiz_start_explain=What is the first IP number of the range of addresses you want to add?
 add_wiz_start_label=S&tarting IP Address:
-add_wiz_generate_explain=Would you like this program to generate a list of client names for you? For example, if you specify the root name "sales", client names will be sales-1, sales-2, etc.
-add_wiz_generate_label=Generate Client Names
-add_wiz_rootname_label=&Root Name:
 add_wiz_invalid_address={0} is not a valid IP address.  Please enter a correctly formatted IP address.
 
 add_wiz_confirm_desc=Confirm the IP address list.
@@ -372,14 +366,6 @@
 cfg_wiz_explain=This wizard will help you configure the system as a DHCP server.
 cfg_wiz_store_explain=Where would you like to store the DHCP configuration data?
 
-cfg_wiz_host_explain=Which of the following nameservices should be used to store hosts records?
-cfg_wiz_no_host_management=Do not manage hosts records
-cfg_wiz_files=/etc/hosts
-cfg_wiz_dns=DNS
-cfg_wiz_hostdata_desc=Select hosts nameservice
-cfg_wiz_domain=Domain:
-cfg_wiz_invalid_host=Unable to manage defined hosts table
-
 cfg_wiz_lease_explain=How long can clients use the IP addresses assigned by this server?
 cfg_wiz_lease_length=&Length of Lease:
 cfg_wiz_negotiable_explain=Check the box below to enable clients to renew their leases prior to expiration.  If you uncheck it, clients will be forced to reboot to obtain a new address when the lease expires.
@@ -537,7 +523,6 @@
 delete_networks_title=Delete Networks
 delete_networks_keep=&Keep Networks:
 delete_networks_delete=&Delete Networks:
-delete_networks_delete_hosts=Delete hosts table entries
 delete_networks_error=The following networks were not deleted:
 network_column=Network
 delete_networks_progress=Deleting network:
@@ -551,7 +536,6 @@
 unconfigure_bootp=Are you sure it is OK to unconfigure the BOOTP relay service?  This may cause clients to be unable to access the network.
 unconfigure_shutdown=DHCP Manager will exit once the service has been unconfigured.
 unconfigure_delete_tables=Remove the dhcptab and all DHCP network tables
-unconfigure_delete_hosts=Remove all hosts table entries for DHCP addresses
 
 unconfigure_progress=Unconfiguring the service
 unconfigure_error_heading=Operation

--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/UnconfigureDialog.java	Fri Aug 06 22:33:35 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/client/UnconfigureDialog.java	Sun Aug 15 15:22:57 2010 -0400
@@ -20,8 +20,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 1998-2002 by Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -47,7 +45,7 @@
  * A dialog to confirm the user's request to unconfigure the service.
  */
 public class UnconfigureDialog extends MultipleOperationDialog {
-    private JCheckBox deleteTables, deleteHosts;
+    private JCheckBox deleteTables;
     private int networkCount = 0;
     private Network [] nets = new Network[0];
 
@@ -61,12 +59,12 @@
     }
 
     protected JPanel getMainPanel() {
-	
+
 	JPanel mainPanel = new JPanel();
 	mainPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-	
+
 	Box box = Box.createVerticalBox();
-	
+
 	if (!DhcpmgrApplet.modeIsRelay) {
 	    JComponent c = Wizard.createTextArea(
 		ResourceStrings.getString("unconfigure_dhcp"), 4, 30);
@@ -76,41 +74,10 @@
 	    deleteTables = new JCheckBox(
 		ResourceStrings.getString("unconfigure_delete_tables"), false);
 	    deleteTables.setToolTipText(
-	        ResourceStrings.getString("unconfigure_delete_tables"));
+		ResourceStrings.getString("unconfigure_delete_tables"));
 	    deleteTables.setAlignmentX(Component.LEFT_ALIGNMENT);
 	    box.add(deleteTables);
 	    box.add(Box.createVerticalStrut(10));
-	    deleteHosts = new JCheckBox(
-		ResourceStrings.getString("unconfigure_delete_hosts"), false);
-	    deleteHosts.setToolTipText(
-	        ResourceStrings.getString("unconfigure_delete_hosts"));
-	    deleteHosts.setAlignmentX(Component.LEFT_ALIGNMENT);
-	    deleteHosts.setEnabled(false);
-	    box.add(deleteHosts);
-	    deleteTables.addActionListener(new ActionListener() {
-		public void actionPerformed(ActionEvent e) {
-
-		    if (!deleteTables.isSelected()) {
-			deleteHosts.setEnabled(false);
-			return;
-		    }
-
-		    // If the host resource is set in the configuration
-		    // file (or we can't tell), then enable the deleteHosts
-		    // checkbox.
-		    try {
-			DhcpServiceMgr serviceMgr =
-			    DataManager.get().getDhcpServiceMgr();
-			DhcpdOptions opts = serviceMgr.readDefaults();
-			if (opts.getHostsResource() != null) {
-			    deleteHosts.setEnabled(true);
-			}
-		    } catch (BridgeException ex) {
-			// Assume set
-			deleteHosts.setEnabled(true);
-		    }
-		}
-	    });
 	} else {
 	    JComponent c = Wizard.createTextArea(
 		ResourceStrings.getString("unconfigure_bootp"), 4, 30);
@@ -126,7 +93,7 @@
 	buttonPanel.setOkEnabled(true);
     	return mainPanel;
     }
-    
+
     protected String getProgressMessage() {
 	return ResourceStrings.getString("unconfigure_progress");
     }
@@ -138,12 +105,12 @@
 	    // Add one for deleting defaults file, and one for deleting macro
 	    length += 2;
 	    if (deleteTables.isSelected()) {
-	    	try {
+		try {
 		    nets = DataManager.get().getNetworks(false);
-	    	} catch (Throwable t) {
-	    	    // Ignore
-	    	}
-	    	length += nets.length + 1; // Add one for dhcptab
+		} catch (Throwable t) {
+		    // Ignore
+		}
+		length += nets.length + 1; // Add one for dhcptab
 	    }
 	}
 	return length;
@@ -156,7 +123,7 @@
     protected Thread getOperationThread() {
 	return new Thread() {
 	    public void run() {
-	    	int checkpoint = 0;
+		int checkpoint = 0;
 		DhcpServiceMgr serviceMgr =
 		    DataManager.get().getDhcpServiceMgr();
 		// Shut down the server
@@ -164,7 +131,7 @@
 		    serviceMgr.shutdown();
 		} catch (Throwable e) {
 		    addError(
-		    	ResourceStrings.getString("unconfigure_error_shutdown"),
+			ResourceStrings.getString("unconfigure_error_shutdown"),
 			e.getMessage());
 		}
 		try {
@@ -175,24 +142,24 @@
 		    return;
 		}
 
-	    	// If this was a relay we're done
-	    	if (!DhcpmgrApplet.modeIsRelay) {
+		// If this was a relay we're done
+		if (!DhcpmgrApplet.modeIsRelay) {
 		    // Remove the server macro
 		    try {
-		    	DataManager.get().getDhcptabMgr().deleteRecord(
+			DataManager.get().getDhcptabMgr().deleteRecord(
 			    new Macro(DataManager.get().getShortServerName()),
 			    false);
 		    } catch (Throwable e) {
 			addError(ResourceStrings.getString(
 			    "unconfigure_error_macro"),
-		    	    e.getMessage());
+			    e.getMessage());
 		    }
 		    try {
 			updateProgress(++checkpoint, ResourceStrings.getString(
 			    "unconfigure_macro_deleted"));
 		    } catch (InterruptedException e) {
 			closeDialog();
-		    	return;
+			return;
 		    }
 
 		    // Delete all the network tables and the dhcptab
@@ -210,8 +177,7 @@
 				args[0] = netString;
 				try {
 				    DataManager.get().getDhcpNetMgr().
-					deleteNetwork(netString, true,
-					deleteHosts.isSelected());
+					deleteNetwork(netString, true);
 				} catch (Throwable e) {
 				    addError(errForm.format(args),
 					e.getMessage());
@@ -219,19 +185,19 @@
 				try {
 				    updateProgress(++checkpoint,
 					progForm.format(args));
-			    	} catch (InterruptedException e) {
+				} catch (InterruptedException e) {
 				    closeDialog();
 				    return;
 				}
 			    }
 			}
-		    	try {
+			try {
 			    DataManager.get().getDhcptabMgr().deleteDhcptab();
-		    	} catch (Throwable e) {
+			} catch (Throwable e) {
 			    addError(ResourceStrings.getString(
-			    	"unconfigure_error_dhcptab"),
+				"unconfigure_error_dhcptab"),
 				e.getMessage());
-		    	}
+			}
 			try {
 			    updateProgress(++checkpoint,
 				ResourceStrings.getString(
@@ -262,7 +228,7 @@
 		    displayErrors(ResourceStrings.getString(
 			"unconfigure_error_messages"));
 		}
-    	    	closeDialog();
+		closeDialog();
 	    }
 	};
     }
@@ -274,7 +240,7 @@
 	    return "unconfigure_server";
 	}
     }
-    
+
     protected void fireActionPerformed() {
 	fireActionPerformed(this, DialogActions.OK);
     }