remove things not used, spotted by lint mostly; ok henning

23 files changed, 60 insertions, 770 deletions

diff --git a/sbin/dhclient/alloc.c b/sbin/dhclient/alloc.c
index de129a1b650..cabb76d4298 100644
--- a/sbin/dhclient/alloc.c
+++ b/sbin/dhclient/alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alloc.c,v 1.8 2004/05/04 18:58:50 deraadt Exp $	*/
+/*	$OpenBSD: alloc.c,v 1.9 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* Memory allocation... */
 
@@ -74,9 +74,3 @@ new_hash_bucket(void)
 
 	return (rval);
 }
-
-void
-free_hash_bucket(struct hash_bucket *ptr)
-{
-	free(ptr);
-}
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 83bfd1031f2..9fcf55b6728 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhclient.c,v 1.39 2004/05/04 18:58:50 deraadt Exp $	*/
+/*	$OpenBSD: dhclient.c,v 1.40 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -73,8 +73,6 @@
 
 time_t cur_time;
 time_t default_lease_time = 43200; /* 12 hours... */
-time_t max_lease_time = 86400; /* 24 hours... */
-struct tree_cache *global_options[256];
 
 char *path_dhclient_conf = _PATH_DHCLIENT_CONF;
 char *path_dhclient_db = NULL;
@@ -83,7 +81,6 @@ int log_perror = 1;
 int privfd;
 
 struct iaddr iaddr_broadcast = { 4, { 255, 255, 255, 255 } };
-struct iaddr iaddr_any = { 4, { 0, 0, 0, 0 } };
 struct in_addr inaddr_any;
 struct sockaddr_in sockaddr_broadcast;
 
@@ -1308,20 +1305,6 @@ send_decline(void *ipp)
 }
 
 void
-send_release(void *ipp)
-{
-	struct interface_info *ip = ipp;
-
-	note("DHCPRELEASE on %s to %s port %d", ip->name,
-	    inet_ntoa(sockaddr_broadcast.sin_addr),
-	    ntohs(sockaddr_broadcast.sin_port));
-
-	/* Send out a packet. */
-	(void) send_packet(ip, &ip->client->packet, ip->client->packet_length,
-	    inaddr_any, &sockaddr_broadcast, NULL);
-}
-
-void
 make_discover(struct interface_info *ip, struct client_lease *lease)
 {
 	unsigned char discover = DHCPDISCOVER;
@@ -1595,62 +1578,6 @@ make_decline(struct interface_info *ip, struct client_lease *lease)
 }
 
 void
-make_release(struct interface_info *ip, struct client_lease *lease)
-{
-	unsigned char request = DHCPRELEASE;
-	struct tree_cache *options[256];
-	struct tree_cache message_type_tree;
-	struct tree_cache server_id_tree;
-	int i;
-
-	memset(options, 0, sizeof(options));
-	memset(&ip->client->packet, 0, sizeof(ip->client->packet));
-
-	/* Set DHCP_MESSAGE_TYPE to DHCPRELEASE */
-	i = DHO_DHCP_MESSAGE_TYPE;
-	options[i] = &message_type_tree;
-	options[i]->value = &request;
-	options[i]->len = sizeof(request);
-	options[i]->buf_size = sizeof(request);
-	options[i]->timeout = 0xFFFFFFFF;
-	options[i]->tree = NULL;
-
-	/* Send back the server identifier... */
-	i = DHO_DHCP_SERVER_IDENTIFIER;
-	options[i] = &server_id_tree;
-	options[i]->value = lease->options[i].data;
-	options[i]->len = lease->options[i].len;
-	options[i]->buf_size = lease->options[i].len;
-	options[i]->timeout = 0xFFFFFFFF;
-	options[i]->tree = NULL;
-
-	/* Set up the option buffer... */
-	ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0,
-	    options, 0, 0, 0, NULL, 0);
-	if (ip->client->packet_length < BOOTP_MIN_LEN)
-		ip->client->packet_length = BOOTP_MIN_LEN;
-
-	ip->client->packet.op = BOOTREQUEST;
-	ip->client->packet.htype = ip->hw_address.htype;
-	ip->client->packet.hlen = ip->hw_address.hlen;
-	ip->client->packet.hops = 0;
-	ip->client->packet.xid = arc4random();
-	ip->client->packet.secs = 0;
-	ip->client->packet.flags = 0;
-
-	memset(&ip->client->packet.ciaddr, 0,
-	    sizeof(ip->client->packet.ciaddr));
-	memset(&ip->client->packet.yiaddr, 0,
-	    sizeof(ip->client->packet.yiaddr));
-	memset(&ip->client->packet.siaddr, 0,
-	    sizeof(ip->client->packet.siaddr));
-	memset(&ip->client->packet.giaddr, 0,
-	    sizeof(ip->client->packet.giaddr));
-	memcpy(ip->client->packet.chaddr,
-	    ip->hw_address.haddr, ip->hw_address.hlen);
-}
-
-void
 free_client_lease(struct client_lease *lease)
 {
 	int i;
@@ -1748,9 +1675,6 @@ write_client_lease(struct interface_info *ip, struct client_lease *lease,
 	fflush(leaseFile);
 }
 
-char scriptName[256];
-FILE *scriptFile;
-
 void
 script_init(char *reason, struct string_list *medium)
 {
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index 8b0f867e740..f5dc9079735 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.h,v 1.30 2004/05/04 18:58:50 deraadt Exp $	*/
+/*	$OpenBSD: dhcpd.h,v 1.31 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -275,7 +275,6 @@ int peek_token(char **, FILE *);
 void skip_to_semi(FILE *);
 int parse_semi(FILE *);
 char *parse_string(FILE *);
-char *parse_host_name(FILE *);
 int parse_ip_addr(FILE *, struct iaddr *);
 void parse_hardware_param(FILE *, struct hardware *);
 void parse_lease_time(FILE *, time_t *);
@@ -286,14 +285,12 @@ time_t parse_date(FILE *);
 
 /* tree.c */
 int tree_evaluate(struct tree_cache *);
-struct dns_host_entry *enter_dns_host(char *);
 pair cons(caddr_t, pair);
 
 /* alloc.c */
 struct string_list	*new_string_list(size_t size);
 struct hash_table	*new_hash_table(int);
 struct hash_bucket	*new_hash_bucket(void);
-void			 free_hash_bucket(struct hash_bucket *);
 
 /* bpf.c */
 int if_register_bpf(struct interface_info *);
@@ -320,14 +317,12 @@ int interface_link_status(char *);
 /* hash.c */
 struct hash_table *new_hash(void);
 void add_hash(struct hash_table *, unsigned char *, int, unsigned char *);
-void delete_hash_entry(struct hash_table *, unsigned char *, int);
 unsigned char *hash_lookup(struct hash_table *, unsigned char *, int);
 
 /* tables.c */
 extern struct option dhcp_options[256];
 extern unsigned char dhcp_option_default_priority_list[];
 extern int sizeof_dhcp_option_default_priority_list;
-extern char *hardware_types[256];
 extern struct hash_table universe_hash;
 extern struct universe dhcp_universe;
 void initialize_universes(void);
@@ -344,9 +339,7 @@ void putShort(unsigned char *, int);
 
 /* inet.c */
 struct iaddr subnet_number(struct iaddr, struct iaddr);
-struct iaddr ip_addr(struct iaddr, struct iaddr, u_int32_t);
 struct iaddr broadcast_addr(struct iaddr, struct iaddr);
-u_int32_t host_addr(struct iaddr, struct iaddr);
 int addr_eq(struct iaddr, struct iaddr);
 char *piaddr(struct iaddr);
 
@@ -365,7 +358,6 @@ void dhcpnak(struct packet *);
 
 void send_discover(void *);
 void send_request(void *);
-void send_release(void *);
 void send_decline(void *);
 
 void state_reboot(void *);
@@ -380,7 +372,6 @@ void bind_lease(struct interface_info *);
 void make_discover(struct interface_info *, struct client_lease *);
 void make_request(struct interface_info *, struct client_lease *);
 void make_decline(struct interface_info *, struct client_lease *);
-void make_release(struct interface_info *, struct client_lease *);
 
 void free_client_lease(struct client_lease *);
 void rewrite_client_leases(void);
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 2ea7b860a7f..0f9723b1933 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dispatch.c,v 1.24 2004/05/04 18:58:50 deraadt Exp $	*/
+/*	$OpenBSD: dispatch.c,v 1.25 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -89,6 +89,7 @@ discover_interfaces(struct interface_info *iface)
 		if (ifa->ifa_addr->sa_family == AF_LINK) {
 			struct sockaddr_dl *foo =
 			    (struct sockaddr_dl *)ifa->ifa_addr;
+
 			iface->index = foo->sdl_index;
 			iface->hw_address.hlen = foo->sdl_alen;
 			iface->hw_address.htype = HTYPE_ETHER; /* XXX */
@@ -122,7 +123,6 @@ discover_interfaces(struct interface_info *iface)
 	if_register_receive(iface);
 	if_register_send(iface);
 	add_protocol(iface->name, iface->rfdesc, got_one, iface);
-
 	freeifaddrs(ifap);
 }
 
@@ -185,9 +185,7 @@ another:
 			to_msec = -1;
 
 		/* Set up the descriptors to be polled. */
-		i = 0;
-
-		for (l = protocols; l; l = l->next) {
+		for (i = 0, l = protocols; l; l = l->next) {
 			struct interface_info *ip = l->local;
 			if (ip && (l->handler != got_one || !ip->dead)) {
 				fds[i].fd = l->fd;
diff --git a/sbin/dhclient/hash.c b/sbin/dhclient/hash.c
index 8457e7ef40a..357370818c7 100644
--- a/sbin/dhclient/hash.c
+++ b/sbin/dhclient/hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.c,v 1.6 2004/05/04 18:58:50 deraadt Exp $	*/
+/*	$OpenBSD: hash.c,v 1.7 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* Routines for manipulating hash tables... */
 
@@ -97,38 +97,6 @@ void add_hash(struct hash_table *table, unsigned char *name, int len,
 	table->buckets[hashno] = bp;
 }
 
-void
-delete_hash_entry(struct hash_table *table, unsigned char *name, int len)
-{
-	int hashno;
-	struct hash_bucket *bp, *pbp = NULL;
-
-	if (!table)
-		return;
-	if (!len)
-		len = strlen((char *)name);
-
-	hashno = do_hash(name, len, table->hash_count);
-
-	/*
-	 * Go through the list looking for an entry that matches; if we
-	 * find it, delete it.
-	 */
-	for (bp = table->buckets[hashno]; bp; bp = bp->next) {
-		if ((!bp->len &&
-		    !strcmp((char *)bp->name, (char *)name)) ||
-		    (bp->len == len && !memcmp(bp->name, name, len))) {
-			if (pbp)
-				pbp->next = bp->next;
-			else
-				table->buckets[hashno] = bp->next;
-			free_hash_bucket(bp);
-			break;
-		}
-		pbp = bp;	/* jwg, 9/6/96 - nice catch! */
-	}
-}
-
 unsigned char *
 hash_lookup(struct hash_table *table, unsigned char *name, int len)
 {
diff --git a/sbin/dhclient/inet.c b/sbin/dhclient/inet.c
index 42466bc6f32..00635aa2b4d 100644
--- a/sbin/dhclient/inet.c
+++ b/sbin/dhclient/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.5 2004/03/02 18:49:21 deraadt Exp $	*/
+/*	$OpenBSD: inet.c,v 1.6 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /*
  * Subroutines to manipulate internet addresses in a safely portable
@@ -66,49 +66,6 @@ subnet_number(struct iaddr addr, struct iaddr mask)
 }
 
 /*
- * Combine a network number and a integer to produce an internet address.
- * This won't work for subnets with more than 32 bits of host address, but
- * maybe this isn't a problem.
- */
-struct iaddr
-ip_addr(struct iaddr subnet, struct iaddr mask, u_int32_t host_address)
-{
-	int i, j, k;
-	u_int32_t swaddr;
-	unsigned char habuf[sizeof(swaddr)];
-	struct iaddr rv;
-
-	swaddr = htonl(host_address);
-	memcpy(habuf, &swaddr, sizeof(swaddr));
-
-	/*
-	 * Combine the subnet address and the host address.   If the
-	 * host address is bigger than can fit in the subnet, return a
-	 * zero-length iaddr structure.
-	 */
-	rv = subnet;
-	j = rv.len - sizeof(habuf);
-	for (i = sizeof(habuf) - 1; i >= 0; i--) {
-		if (mask.iabuf[i + j]) {
-			if (habuf[i] > (mask.iabuf[i + j] ^ 0xFF)) {
-				rv.len = 0;
-				return (rv);
-			}
-			for (k = i - 1; k >= 0; k--)
-				if (habuf[k]) {
-					rv.len = 0;
-					return (rv);
-				}
-			rv.iabuf[i + j] |= habuf[i];
-			break;
-		} else
-			rv.iabuf[i + j] = habuf[i];
-	}
-
-	return (rv);
-}
-
-/*
  * Given a subnet number and netmask, return the address on that subnet
  * for which the host portion of the address is all ones (the standard
  * broadcast address).
@@ -131,27 +88,6 @@ broadcast_addr(struct iaddr subnet, struct iaddr mask)
 	return (rv);
 }
 
-u_int32_t
-host_addr(struct iaddr addr, struct iaddr mask)
-{
-	int i;
-	u_int32_t swaddr;
-	struct iaddr rv;
-
-	rv.len = 0;
-
-	/* Mask out the network bits... */
-	rv.len = addr.len;
-	for (i = 0; i < rv.len; i++)
-		rv.iabuf[i] = addr.iabuf[i] & ~mask.iabuf[i];
-
-	/* Copy out up to 32 bits... */
-	memcpy(&swaddr, &rv.iabuf[rv.len - sizeof(swaddr)], sizeof(swaddr));
-
-	/* Swap it and return it. */
-	return (ntohl(swaddr));
-}
-
 int
 addr_eq(struct iaddr addr1, struct iaddr addr2)
 {
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index 61382e89c37..cd3940ad343 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.8 2004/04/14 20:22:27 henning Exp $	*/
+/*	$OpenBSD: options.c,v 1.9 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* DHCP options parsing and reassembly. */
 
@@ -102,10 +102,8 @@ void
 parse_option_buffer(struct packet *packet,
     unsigned char *buffer, int length)
 {
-	unsigned char *s, *t;
-	unsigned char *end = buffer + length;
-	int len;
-	int code;
+	unsigned char *s, *t, *end = buffer + length;
+	int len, code;
 
 	for (s = buffer; *s != DHO_END && s < end; ) {
 		code = s[0];
@@ -203,13 +201,9 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
     int overload, /* Overload flags that may be set. */
     int terminate, int bootpp, u_int8_t *prl, int prl_len)
 {
-	unsigned char priority_list[300];
-	int priority_len;
-	unsigned char buffer[4096];	/* Really big buffer... */
-	int main_buffer_size;
-	int mainbufix, bufix;
-	int option_size;
-	int length;
+	unsigned char priority_list[300], buffer[4096];
+	int priority_len, main_buffer_size, mainbufix, bufix;
+	int option_size, length;
 
 	/*
 	 * If the client has provided a maximum DHCP message size, use
@@ -350,11 +344,7 @@ store_options(unsigned char *buffer, int buflen, struct tree_cache **options,
     unsigned char *priority_list, int priority_len, int first_cutoff,
     int second_cutoff, int terminate)
 {
-	int bufix = 0;
-	int option_stored[256];
-	int i;
-	int ix;
-	int tto;
+	int bufix = 0, option_stored[256], i, ix, tto;
 
 	/* Zero out the stored-lengths array. */
 	memset(option_stored, 0, sizeof(option_stored));
@@ -463,18 +453,13 @@ pretty_print_option(unsigned int code, unsigned char *data, int len,
     int emit_commas, int emit_quotes)
 {
 	static char optbuf[32768]; /* XXX */
-	int hunksize = 0;
-	int numhunk = -1;
-	int numelem = 0;
-	char fmtbuf[32];
-	int i, j, k;
-	char *op = optbuf;
-	int opleft = sizeof(optbuf);
+	int hunksize = 0, numhunk = -1, numelem = 0;
+	char fmtbuf[32], *op = optbuf;
+	int i, j, k, opleft = sizeof(optbuf);
 	unsigned char *dp = data;
 	struct in_addr foo;
 	char comma;
 
-
 	/* Code should be between 0 and 255. */
 	if (code > 255)
 		error("pretty_print_option: bad code %d\n", code);
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index de1a87ac37b..4a6a50bdf2a 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.7 2004/02/24 13:08:26 henning Exp $	*/
+/*	$OpenBSD: parse.c,v 1.8 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* Common parser code for dhcpd and dhclient. */
 
@@ -133,63 +133,6 @@ parse_string(FILE *cfile)
 	return (s);
 }
 
-/*
- * hostname :== identifier | hostname DOT identifier
- */
-char *
-parse_host_name(FILE *cfile)
-{
-	char *val;
-	int token;
-	int len = 0;
-	char *s;
-	char *t;
-	pair c = NULL;
-
-	/* Read a dotted hostname... */
-	do {
-		/* Read a token, which should be an identifier. */
-		token = next_token(&val, cfile);
-		if (!is_identifier(token) && token != NUMBER) {
-			parse_warn("expecting an identifier in hostname");
-			skip_to_semi(cfile);
-			return (NULL);
-		}
-		/* Store this identifier... */
-		if (!(s = malloc(strlen(val) + 1)))
-			error("can't allocate temp space for hostname.");
-		strlcpy(s, val, strlen(val) + 1);
-		c = cons((caddr_t)s, c);
-		len += strlen(s) + 1;
-		/*
-		 * Look for a dot; if it's there, keep going, otherwise
-		 * we're done.
-		 */
-		token = peek_token(&val, cfile);
-		if (token == DOT)
-			token = next_token(&val, cfile);
-	} while (token == DOT);
-
-	/* Assemble the hostname together into a string. */
-	if (!(s = malloc(len)))
-		error("can't allocate space for hostname.");
-	t = s + len;
-	*--t = '\0';
-	while (c) {
-		pair cdr = c->cdr;
-		int l = strlen((char *)c->car);
-		t -= l;
-		memcpy(t, (char *)c->car, l);
-		/* Free up temp space. */
-		free(c->car);
-		free(c);
-		c = cdr;
-		if (t != s)
-			*--t = '.';
-	}
-	return (s);
-}
-
 int
 parse_ip_addr(FILE *cfile, struct iaddr *addr)
 {
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index faec6306c9d..6648756952c 100644
--- a/sbin/dhclient/tables.c
+++ b/sbin/dhclient/tables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tables.c,v 1.3 2004/02/07 13:26:35 henning Exp $	*/
+/*	$OpenBSD: tables.c,v 1.4 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* Tables of information... */
 
@@ -406,268 +406,6 @@ unsigned char dhcp_option_default_priority_list[] = {
 int sizeof_dhcp_option_default_priority_list =
 	sizeof(dhcp_option_default_priority_list);
 
-
-char *hardware_types[] = {
-	"unknown-0",
-	"ethernet",
-	"unknown-2",
-	"unknown-3",
-	"unknown-4",
-	"unknown-5",
-	"token-ring",
-	"unknown-7",
-	"fddi",
-	"unknown-9",
-	"unknown-10",
-	"unknown-11",
-	"unknown-12",
-	"unknown-13",
-	"unknown-14",
-	"unknown-15",
-	"unknown-16",
-	"unknown-17",
-	"unknown-18",
-	"unknown-19",
-	"unknown-20",
-	"unknown-21",
-	"unknown-22",
-	"unknown-23",
-	"unknown-24",
-	"unknown-25",
-	"unknown-26",
-	"unknown-27",
-	"unknown-28",
-	"unknown-29",
-	"unknown-30",
-	"unknown-31",
-	"unknown-32",
-	"unknown-33",
-	"unknown-34",
-	"unknown-35",
-	"unknown-36",
-	"unknown-37",
-	"unknown-38",
-	"unknown-39",
-	"unknown-40",
-	"unknown-41",
-	"unknown-42",
-	"unknown-43",
-	"unknown-44",
-	"unknown-45",
-	"unknown-46",
-	"unknown-47",
-	"unknown-48",
-	"unknown-49",
-	"unknown-50",
-	"unknown-51",
-	"unknown-52",
-	"unknown-53",
-	"unknown-54",
-	"unknown-55",
-	"unknown-56",
-	"unknown-57",
-	"unknown-58",
-	"unknown-59",
-	"unknown-60",
-	"unknown-61",
-	"unknown-62",
-	"unknown-63",
-	"unknown-64",
-	"unknown-65",
-	"unknown-66",
-	"unknown-67",
-	"unknown-68",
-	"unknown-69",
-	"unknown-70",
-	"unknown-71",
-	"unknown-72",
-	"unknown-73",
-	"unknown-74",
-	"unknown-75",
-	"unknown-76",
-	"unknown-77",
-	"unknown-78",
-	"unknown-79",
-	"unknown-80",
-	"unknown-81",
-	"unknown-82",
-	"unknown-83",
-	"unknown-84",
-	"unknown-85",
-	"unknown-86",
-	"unknown-87",
-	"unknown-88",
-	"unknown-89",
-	"unknown-90",
-	"unknown-91",
-	"unknown-92",
-	"unknown-93",
-	"unknown-94",
-	"unknown-95",
-	"unknown-96",
-	"unknown-97",
-	"unknown-98",
-	"unknown-99",
-	"unknown-100",
-	"unknown-101",
-	"unknown-102",
-	"unknown-103",
-	"unknown-104",
-	"unknown-105",
-	"unknown-106",
-	"unknown-107",
-	"unknown-108",
-	"unknown-109",
-	"unknown-110",
-	"unknown-111",
-	"unknown-112",
-	"unknown-113",
-	"unknown-114",
-	"unknown-115",
-	"unknown-116",
-	"unknown-117",
-	"unknown-118",
-	"unknown-119",
-	"unknown-120",
-	"unknown-121",
-	"unknown-122",
-	"unknown-123",
-	"unknown-124",
-	"unknown-125",
-	"unknown-126",
-	"unknown-127",
-	"unknown-128",
-	"unknown-129",
-	"unknown-130",
-	"unknown-131",
-	"unknown-132",
-	"unknown-133",
-	"unknown-134",
-	"unknown-135",
-	"unknown-136",
-	"unknown-137",
-	"unknown-138",
-	"unknown-139",
-	"unknown-140",
-	"unknown-141",
-	"unknown-142",
-	"unknown-143",
-	"unknown-144",
-	"unknown-145",
-	"unknown-146",
-	"unknown-147",
-	"unknown-148",
-	"unknown-149",
-	"unknown-150",
-	"unknown-151",
-	"unknown-152",
-	"unknown-153",
-	"unknown-154",
-	"unknown-155",
-	"unknown-156",
-	"unknown-157",
-	"unknown-158",
-	"unknown-159",
-	"unknown-160",
-	"unknown-161",
-	"unknown-162",
-	"unknown-163",
-	"unknown-164",
-	"unknown-165",
-	"unknown-166",
-	"unknown-167",
-	"unknown-168",
-	"unknown-169",
-	"unknown-170",
-	"unknown-171",
-	"unknown-172",
-	"unknown-173",
-	"unknown-174",
-	"unknown-175",
-	"unknown-176",
-	"unknown-177",
-	"unknown-178",
-	"unknown-179",
-	"unknown-180",
-	"unknown-181",
-	"unknown-182",
-	"unknown-183",
-	"unknown-184",
-	"unknown-185",
-	"unknown-186",
-	"unknown-187",
-	"unknown-188",
-	"unknown-189",
-	"unknown-190",
-	"unknown-191",
-	"unknown-192",
-	"unknown-193",
-	"unknown-194",
-	"unknown-195",
-	"unknown-196",
-	"unknown-197",
-	"unknown-198",
-	"unknown-199",
-	"unknown-200",
-	"unknown-201",
-	"unknown-202",
-	"unknown-203",
-	"unknown-204",
-	"unknown-205",
-	"unknown-206",
-	"unknown-207",
-	"unknown-208",
-	"unknown-209",
-	"unknown-210",
-	"unknown-211",
-	"unknown-212",
-	"unknown-213",
-	"unknown-214",
-	"unknown-215",
-	"unknown-216",
-	"unknown-217",
-	"unknown-218",
-	"unknown-219",
-	"unknown-220",
-	"unknown-221",
-	"unknown-222",
-	"unknown-223",
-	"unknown-224",
-	"unknown-225",
-	"unknown-226",
-	"unknown-227",
-	"unknown-228",
-	"unknown-229",
-	"unknown-230",
-	"unknown-231",
-	"unknown-232",
-	"unknown-233",
-	"unknown-234",
-	"unknown-235",
-	"unknown-236",
-	"unknown-237",
-	"unknown-238",
-	"unknown-239",
-	"unknown-240",
-	"unknown-241",
-	"unknown-242",
-	"unknown-243",
-	"unknown-244",
-	"unknown-245",
-	"unknown-246",
-	"unknown-247",
-	"unknown-248",
-	"unknown-249",
-	"unknown-250",
-	"unknown-251",
-	"unknown-252",
-	"unknown-253",
-	"unknown-254",
-	"unknown-255"
-};
-
-
-
 struct hash_table universe_hash;
 
 void
diff --git a/sbin/dhclient/tree.c b/sbin/dhclient/tree.c
index 88c2369b76f..58b6694f387 100644
--- a/sbin/dhclient/tree.c
+++ b/sbin/dhclient/tree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.c,v 1.10 2004/04/14 20:22:27 henning Exp $	*/
+/*	$OpenBSD: tree.c,v 1.11 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* Routines for manipulating parse trees... */
 
@@ -62,19 +62,6 @@ cons(caddr_t car, pair cdr)
 	return (foo);
 }
 
-struct dns_host_entry *
-enter_dns_host(char *name)
-{
-	struct dns_host_entry *dh;
-	int len = strlen(name) + 1;
-
-	if (!(dh = calloc(1, sizeof(struct dns_host_entry)))
-	    || !(dh->hostname = calloc(1, len)))
-		error("Can't allocate space for new host.");
-	strlcpy(dh->hostname, name, len);
-	return (dh);
-}
-
 int
 tree_evaluate(struct tree_cache *tree_cache)
 {
diff --git a/usr.sbin/dhcpd/alloc.c b/usr.sbin/dhcpd/alloc.c
index bd12382cf2f..e02aa69278b 100644
--- a/usr.sbin/dhcpd/alloc.c
+++ b/usr.sbin/dhcpd/alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alloc.c,v 1.2 2004/04/14 00:20:25 henning Exp $	*/
+/*	$OpenBSD: alloc.c,v 1.3 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* Memory allocation... */
 
@@ -42,8 +42,6 @@
 
 #include "dhcpd.h"
 
-struct dhcp_packet *dhcp_free_list;
-struct packet *packet_free_list;
 struct lease_state *free_lease_states;
 
 void *
@@ -74,17 +72,6 @@ new_tree(char *name)
 	return (rval);
 }
 
-struct string_list *
-new_string_list(size_t size, char * name)
-{
-	struct string_list *rval;
-
-	rval = dmalloc(sizeof(struct string_list) + size, name);
-	if (rval != NULL)
-		rval->string = ((char *)rval) + sizeof(struct string_list);
-	return (rval);
-}
-
 struct tree_cache *free_tree_caches;
 
 struct tree_cache *
@@ -132,42 +119,18 @@ free_hash_bucket(struct hash_bucket *ptr, char *name)
 }
 
 void
-free_hash_table(struct hash_table *ptr, char *name)
-{
-	dfree(ptr, name);
-}
-
-void
-free_tree_cache(struct tree_cache *ptr, char *name)
+free_tree_cache(struct tree_cache *ptr)
 {
 	ptr->value = (unsigned char *)free_tree_caches;
 	free_tree_caches = ptr;
 }
 
 void
-free_packet(struct packet *ptr, char *name)
-{
-	dfree(ptr, name);
-}
-
-void
-free_dhcp_packet(struct dhcp_packet *ptr, char *name)
-{
-	dfree(ptr, name);
-}
-
-void
 free_tree(struct tree *ptr, char *name)
 {
 	dfree(ptr, name);
 }
 
-void
-free_string_list(struct string_list *ptr, char *name)
-{
-	dfree(ptr, name);
-}
-
 struct shared_network *
 new_shared_network(char *name)
 {
diff --git a/usr.sbin/dhcpd/bootp.c b/usr.sbin/dhcpd/bootp.c
index 5a5317bd364..c9f975df968 100644
--- a/usr.sbin/dhcpd/bootp.c
+++ b/usr.sbin/dhcpd/bootp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootp.c,v 1.7 2004/04/21 09:11:58 canacar Exp $	*/
+/*	$OpenBSD: bootp.c,v 1.8 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /*
  * BOOTP Protocol support.
@@ -333,7 +333,7 @@ lose:
 		to.sin_port = server_port;
 
 		if (fallback_interface) {
-			result = send_packet(fallback_interface, NULL, &raw,
+			result = send_packet(fallback_interface, &raw,
 			    outgoing.packet_length, from, &to, &hto);
 			return;
 		}
@@ -355,6 +355,6 @@ lose:
 	}
 
 	errno = 0;
-	result = send_packet(packet->interface, packet, &raw,
+	result = send_packet(packet->interface, &raw,
 	    outgoing.packet_length, from, &to, &hto);
 }
diff --git a/usr.sbin/dhcpd/bpf.c b/usr.sbin/dhcpd/bpf.c
index 7501ca30cb5..0d13b116e81 100644
--- a/usr.sbin/dhcpd/bpf.c
+++ b/usr.sbin/dhcpd/bpf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpf.c,v 1.3 2004/04/21 09:11:58 canacar Exp $	*/
+/*	$OpenBSD: bpf.c,v 1.4 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* BPF socket interface code, originally contributed by Archie Cobbs. */
 
@@ -226,9 +226,9 @@ if_register_receive(struct interface_info *info)
 }
 
 ssize_t
-send_packet(struct interface_info *interface, struct packet *packet,
-    struct dhcp_packet *raw, size_t len, struct in_addr from,
-    struct sockaddr_in *to, struct hardware *hto)
+send_packet(struct interface_info *interface, struct dhcp_packet *raw,
+    size_t len, struct in_addr from, struct sockaddr_in *to,
+    struct hardware *hto)
 {
 	unsigned char buf[256];
 	struct iovec iov[2];
diff --git a/usr.sbin/dhcpd/convert.c b/usr.sbin/dhcpd/convert.c
index aefd645eacc..4f1e6fc93e5 100644
--- a/usr.sbin/dhcpd/convert.c
+++ b/usr.sbin/dhcpd/convert.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: convert.c,v 1.2 2004/04/14 01:27:49 henning Exp $	*/
+/*	$OpenBSD: convert.c,v 1.3 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /*
  * Safe copying of option values into and out of the option buffer,
@@ -54,6 +54,7 @@ getULong(unsigned char *buf)
 	return (ntohl(ibuf));
 }
 
+#ifdef DEBUG_PACKET
 int32_t
 getLong(unsigned char *(buf))
 {
@@ -62,6 +63,7 @@ getLong(unsigned char *(buf))
 	memcpy(&ibuf, buf, sizeof(ibuf));
 	return (ntohl(ibuf));
 }
+#endif
 
 u_int16_t
 getUShort(unsigned char *buf)
@@ -72,6 +74,7 @@ getUShort(unsigned char *buf)
 	return (ntohs(ibuf));
 }
 
+#ifdef DEBUG_PACKET
 int16_t
 getShort(unsigned char *buf)
 {
@@ -80,6 +83,7 @@ getShort(unsigned char *buf)
 	memcpy(&ibuf, buf, sizeof(ibuf));
 	return (ntohs(ibuf));
 }
+#endif
 
 void
 putULong(unsigned char *obuf, u_int32_t val)
diff --git a/usr.sbin/dhcpd/dhcp.c b/usr.sbin/dhcpd/dhcp.c
index 8a1772daac6..530fcb9ef3d 100644
--- a/usr.sbin/dhcpd/dhcp.c
+++ b/usr.sbin/dhcpd/dhcp.c
@@ -568,7 +568,7 @@ nak_lease(struct packet *packet, struct iaddr *cip)
 		to.sin_port = server_port;
 
 		if (fallback_interface) {
-			result = send_packet(fallback_interface, packet, &raw,
+			result = send_packet(fallback_interface, &raw,
 			    outgoing.packet_length, from, &to, &hto);
 			if (result == -1)
 				warn("send_fallback: %m");
@@ -580,7 +580,7 @@ nak_lease(struct packet *packet, struct iaddr *cip)
 	}
 
 	errno = 0;
-	result = send_packet(packet->interface, packet, &raw,
+	result = send_packet(packet->interface, &raw,
 	    outgoing.packet_length, from, &to, NULL);
 }
 
@@ -1174,7 +1174,7 @@ dhcp_reply(struct lease *lease)
 	for (i = 0; i < 256; i++) {
 		if (state->options[i] &&
 		    state->options[i]->flags & TC_TEMPORARY)
-			free_tree_cache(state->options[i], "dhcp_reply");
+			free_tree_cache(state->options[i]);
 	}
 
 	memcpy(&raw.ciaddr, &state->ciaddr, sizeof raw.ciaddr);
@@ -1233,8 +1233,8 @@ dhcp_reply(struct lease *lease)
 		to.sin_port = server_port;
 
 		if (fallback_interface) {
-			result = send_packet(fallback_interface, NULL,
-			    &raw, packet_length,raw.siaddr, &to, NULL);
+			result = send_packet(fallback_interface, &raw,
+			    packet_length,raw.siaddr, &to, NULL);
 
 			free_lease_state(state, "dhcp_reply fallback 1");
 			lease->state = NULL;
@@ -1262,8 +1262,8 @@ dhcp_reply(struct lease *lease)
 		to.sin_port = client_port;
 
 		if (fallback_interface) {
-			result = send_packet(fallback_interface, NULL,
-			    &raw, packet_length, raw.siaddr, &to, NULL);
+			result = send_packet(fallback_interface, &raw,
+			    packet_length, raw.siaddr, &to, NULL);
 			free_lease_state(state, "dhcp_reply fallback 2");
 			lease->state = NULL;
 			return;
@@ -1285,7 +1285,7 @@ dhcp_reply(struct lease *lease)
 
 	memcpy(&from, state->from.iabuf, sizeof from);
 
-	result = send_packet(state->ip, NULL, &raw, packet_length,
+	result = send_packet(state->ip, &raw, packet_length,
 	    from, &to, &hto);
 
 	free_lease_state(state, "dhcp_reply");
diff --git a/usr.sbin/dhcpd/dhcpd.c b/usr.sbin/dhcpd/dhcpd.c
index d0ef164a2e9..035ef4b52c7 100644
--- a/usr.sbin/dhcpd/dhcpd.c
+++ b/usr.sbin/dhcpd/dhcpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.c,v 1.17 2004/04/21 09:11:58 canacar Exp $ */
+/*	$OpenBSD: dhcpd.c,v 1.18 2004/05/04 20:28:40 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org>
@@ -47,9 +47,6 @@ void usage(void);
 time_t cur_time;
 struct group root_group;
 
-struct iaddr server_identifier;
-int server_identifier_matched;
-
 u_int16_t server_port;
 u_int16_t client_port;
 
diff --git a/usr.sbin/dhcpd/dhcpd.h b/usr.sbin/dhcpd/dhcpd.h
index 380a7bc5f33..57e6a98aa17 100644
--- a/usr.sbin/dhcpd/dhcpd.h
+++ b/usr.sbin/dhcpd/dhcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.h,v 1.11 2004/04/22 15:22:48 henning Exp $ */
+/*	$OpenBSD: dhcpd.h,v 1.12 2004/05/04 20:28:40 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999
@@ -665,7 +665,6 @@ struct class *add_class(int, char *);
 struct class *find_class(int, unsigned char *, int);
 struct group *clone_group(struct group *, char *);
 void write_leases(void);
-void dump_subnets(void);
 
 /* alloc.c */
 void * dmalloc(int, char *);
@@ -686,7 +685,6 @@ struct protocol *new_protocol(char *);
 struct lease_state *new_lease_state(char *);
 struct domain_search_list *new_domain_search_list(char *);
 struct name_server *new_name_server(char *);
-struct string_list *new_string_list(size_t size, char * name);
 void free_name_server(struct name_server *, char *);
 void free_domain_search_list(struct domain_search_list *, char *);
 void free_lease_state(struct lease_state *, char *);
@@ -697,27 +695,22 @@ void free_class(struct class *, char *);
 void free_subnet(struct subnet *, char *);
 void free_lease(struct lease *, char *);
 void free_hash_bucket(struct hash_bucket *, char *);
-void free_hash_table(struct hash_table *, char *);
-void free_tree_cache(struct tree_cache *, char *);
-void free_packet(struct packet *, char *);
-void free_dhcp_packet(struct dhcp_packet *, char *);
+void free_tree_cache(struct tree_cache *);
 void free_tree(struct tree *, char *);
-void free_string_list(struct string_list *, char *);
 
 /* print.c */
 char *print_hw_addr(int, int, unsigned char *);
-void print_lease(struct lease *);
 void dump_raw(unsigned char *, int);
+#ifdef DEBUG_PACKET
 void dump_packet(struct packet *);
-void hash_dump(struct hash_table *);
+#endif
 
 /* bpf.c */
 int if_register_bpf(struct interface_info *);
 void if_reinitialize_send(struct interface_info *);
 void if_register_send(struct interface_info *);
-ssize_t send_packet(struct interface_info *, struct packet *,
-    struct dhcp_packet *, size_t, struct in_addr, struct sockaddr_in *,
-    struct hardware *);
+ssize_t send_packet(struct interface_info *, struct dhcp_packet *, size_t,
+    struct in_addr, struct sockaddr_in *, struct hardware *);
 void if_reinitialize_receive(struct interface_info *);
 void if_register_receive(struct interface_info *);
 ssize_t receive_packet(struct interface_info *, unsigned char *, size_t,
@@ -735,8 +728,6 @@ extern void (*bootp_packet_handler)(struct interface_info *,
     struct dhcp_packet *, int, unsigned int, struct iaddr, struct hardware *);
 extern struct timeout *timeouts;
 void discover_interfaces(int);
-struct interface_info *setup_fallback(void);
-void reinitialize_interfaces(void);
 void dispatch(void);
 int locate_network(struct packet *);
 void got_one(struct protocol *);
@@ -773,7 +764,6 @@ void putShort(unsigned char *, int);
 /* inet.c */
 struct iaddr subnet_number(struct iaddr, struct iaddr);
 struct iaddr ip_addr(struct iaddr, struct iaddr, u_int32_t);
-struct iaddr broadcast_addr(struct iaddr, struct iaddr);
 u_int32_t host_addr(struct iaddr, struct iaddr);
 int addr_eq(struct iaddr, struct iaddr);
 char *piaddr(struct iaddr);
diff --git a/usr.sbin/dhcpd/dispatch.c b/usr.sbin/dhcpd/dispatch.c
index e5f57fefab1..a80cbe956e4 100644
--- a/usr.sbin/dhcpd/dispatch.c
+++ b/usr.sbin/dhcpd/dispatch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dispatch.c,v 1.8 2004/04/20 05:35:33 henning Exp $ */
+/*	$OpenBSD: dispatch.c,v 1.9 2004/05/04 20:28:40 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999
@@ -276,32 +276,6 @@ discover_interfaces(int state)
 	freeifaddrs(ifap);
 }
 
-struct interface_info *
-setup_fallback(void)
-{
-	fallback_interface = ((struct interface_info *)dmalloc(
-	    sizeof *fallback_interface, "discover_interfaces"));
-
-	if (!fallback_interface)
-		error("Insufficient memory to record fallback interface.");
-	memset(fallback_interface, 0, sizeof *fallback_interface);
-	strlcpy(fallback_interface->name, "fallback", IFNAMSIZ);
-	fallback_interface->shared_network =
-	    new_shared_network("parse_statement");
-	if (!fallback_interface->shared_network)
-		error("No memory for shared subnet");
-	memset(fallback_interface->shared_network, 0,
-	    sizeof(struct shared_network));
-	fallback_interface->shared_network->name = "fallback-net";
-	return fallback_interface;
-}
-
-void
-reinitialize_interfaces(void)
-{
-	interfaces_invalidated = 1;
-}
-
 /*
  * Wait for packets to come in using poll().  When a packet comes in,
  * call receive_packet to receive the packet and possibly strip hardware
diff --git a/usr.sbin/dhcpd/inet.c b/usr.sbin/dhcpd/inet.c
index d59c85921af..788abcdfc83 100644
--- a/usr.sbin/dhcpd/inet.c
+++ b/usr.sbin/dhcpd/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.3 2004/04/16 04:30:09 deraadt Exp $	*/
+/*	$OpenBSD: inet.c,v 1.4 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /*
  * Subroutines to manipulate internet addresses in a safely portable
@@ -108,29 +108,6 @@ ip_addr(struct iaddr subnet, struct iaddr mask, u_int32_t host_address)
 	return (rv);
 }
 
-/*
- * Given a subnet number and netmask, return the address on that subnet
- * for which the host portion of the address is all ones (the standard
- * broadcast address).
- */
-struct iaddr
-broadcast_addr(struct iaddr subnet, struct iaddr mask)
-{
-	int i;
-	struct iaddr rv;
-
-	if (subnet.len != mask.len) {
-		rv.len = 0;
-		return (rv);
-	}
-
-	for (i = 0; i < subnet.len; i++)
-		rv.iabuf[i] = subnet.iabuf[i] | (~mask.iabuf[i] & 255);
-	rv.len = subnet.len;
-
-	return (rv);
-}
-
 u_int32_t
 host_addr(struct iaddr addr, struct iaddr mask)
 {
diff --git a/usr.sbin/dhcpd/memory.c b/usr.sbin/dhcpd/memory.c
index 178dce9acda..e28d1a609eb 100644
--- a/usr.sbin/dhcpd/memory.c
+++ b/usr.sbin/dhcpd/memory.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memory.c,v 1.6 2004/04/20 05:35:33 henning Exp $ */
+/*	$OpenBSD: memory.c,v 1.7 2004/05/04 20:28:40 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
@@ -842,28 +842,3 @@ write_leases(void)
 	if (!commit_leases())
 		error("Can't commit leases to new database: %m");
 }
-
-void
-dump_subnets(void)
-{
-	struct lease *l;
-	struct shared_network *s;
-	struct subnet *n;
-
-	note("Subnets:");
-	for (n = subnets; n; n = n->next_subnet) {
-		debug("  Subnet %s", piaddr(n->net));
-		debug("     netmask %s", piaddr(n->netmask));
-	}
-	note("Shared networks:");
-	for (s = shared_networks; s; s = s->next) {
-		note("  %s", s->name);
-		for (l = s->leases; l; l = l->next) {
-			print_lease(l);
-		}
-		if (s->last_lease) {
-			debug("    Last Lease:");
-			print_lease(s->last_lease);
-		}
-	}
-}
diff --git a/usr.sbin/dhcpd/options.c b/usr.sbin/dhcpd/options.c
index 97bf6a2718a..cd8157c61fb 100644
--- a/usr.sbin/dhcpd/options.c
+++ b/usr.sbin/dhcpd/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.2 2004/04/14 01:27:49 henning Exp $	*/
+/*	$OpenBSD: options.c,v 1.3 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* DHCP options parsing and reassembly. */
 
@@ -457,6 +457,7 @@ store_options(unsigned char *buffer, int buflen, struct tree_cache **options,
 	return (bufix);
 }
 
+#ifdef DEBUG_PACKET
 /*
  * Format the specified option so that a human can easily read it.
  */
@@ -701,6 +702,7 @@ pretty_print_option(unsigned int code, unsigned char *data, int len,
 	warn("dhcp option too large");
 	return ("<error>");
 }
+#endif /* DEBUG_PACKET */
 
 void
 do_packet(struct interface_info *interface, struct dhcp_packet *packet,
diff --git a/usr.sbin/dhcpd/parse.c b/usr.sbin/dhcpd/parse.c
index 432da72185c..d02f1f1fb08 100644
--- a/usr.sbin/dhcpd/parse.c
+++ b/usr.sbin/dhcpd/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.5 2004/04/18 00:43:27 deraadt Exp $	*/
+/*	$OpenBSD: parse.c,v 1.6 2004/05/04 20:28:40 deraadt Exp $	*/
 
 /* Common parser code for dhcpd and dhclient. */
 
@@ -188,16 +188,6 @@ parse_host_name(FILE *cfile)
 	return (s);
 }
 
-int
-parse_ip_addr(FILE *cfile, struct iaddr *addr)
-{
-	addr->len = 4;
-	if (parse_numeric_aggregate(cfile, addr->iabuf,
-	    &addr->len, DOT, 10, 8))
-		return (1);
-	return (0);
-}
-
 /*
  * hardware-parameter :== HARDWARE ETHERNET csns SEMI
  * csns :== NUMBER | csns COLON NUMBER
diff --git a/usr.sbin/dhcpd/print.c b/usr.sbin/dhcpd/print.c
index c20267922d5..30de7624a22 100644
--- a/usr.sbin/dhcpd/print.c
+++ b/usr.sbin/dhcpd/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.6 2004/04/20 05:35:33 henning Exp $ */
+/*	$OpenBSD: print.c,v 1.7 2004/05/04 20:28:40 deraadt Exp $ */
 
 /* Turn data structures into printable text. */
 
@@ -73,32 +73,7 @@ bad:
 
 }
 
-void
-print_lease(struct lease *lease)
-{
-	struct tm	*t;
-	char	tbuf[32];
-
-	debug("      Lease %s", piaddr(lease->ip_addr));
-
-	t = gmtime(&lease->starts);
-	strftime(tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
-	debug("        start %s", tbuf);
-
-	t = gmtime(&lease->ends);
-	strftime(tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
-	debug("        end %s", tbuf);
-
-	t = gmtime(&lease->timestamp);
-	strftime(tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
-	debug("        stamp %s", tbuf);
-
-	debug("        hardware addr = %s",
-	    print_hw_addr(lease->hardware_addr.htype,
-	    lease->hardware_addr.hlen, lease->hardware_addr.haddr));
-	debug("        host %s  ", lease->host ? lease->host->name : "<none>");
-}
-
+#ifdef DEBUG_PACKET
 void
 dump_packet(struct packet *tp)
 {
@@ -164,25 +139,4 @@ dump_raw(unsigned char *buf, int len)
 	}
 	note("%s", lbuf);
 }
-
-void
-hash_dump(struct hash_table *table)
-{
-	struct hash_bucket *bp;
-	int	i;
-
-	if (!table)
-		return;
-
-	for (i = 0; i < table->hash_count; i++) {
-		if (!table->buckets[i])
-			continue;
-		note("hash bucket %d:", i);
-		for (bp = table->buckets[i]; bp; bp = bp->next) {
-			if (bp->len)
-				dump_raw(bp->name, bp->len);
-			else
-				note("%s", (char *)bp->name);
-		}
-	}
-}
+#endif /* DEBUG_PACKET */