spaces

11 files changed, 88 insertions, 90 deletions

diff --git a/usr.sbin/dhcpd/bootp.c b/usr.sbin/dhcpd/bootp.c
index 902d2f4f5ef..dad169cefc1 100644
--- a/usr.sbin/dhcpd/bootp.c
+++ b/usr.sbin/dhcpd/bootp.c
@@ -113,7 +113,7 @@ void bootp (packet)
 					       packet -> raw -> chaddr));
 			return;
 		}
-			
+
 		if (host && (!host -> group -> allow_bootp)) {
 			note ("Ignoring BOOTP request from client %s",
 			      host -> name
@@ -123,7 +123,7 @@ void bootp (packet)
 					       packet -> raw -> chaddr));
 			return;
 		}
-			
+
 		/* If we've been told not to boot unknown clients,
 		   and we didn't find any host record for this client,
 		   ignore it. */
@@ -213,14 +213,14 @@ void bootp (packet)
 		      hp -> name);
 		return;
 	}
-			
+
 	/* Make sure we're allowed to boot this client with bootp. */
 	if (hp && (!hp -> group -> allow_bootp)) {
 		note ("Ignoring BOOTP request from client %s",
 		      hp -> name);
 		return;
 	}
-			
+
 	/* Set up the outgoing packet... */
 	memset (&outgoing, 0, sizeof outgoing);
 	memset (&raw, 0, sizeof raw);
diff --git a/usr.sbin/dhcpd/confpars.c b/usr.sbin/dhcpd/confpars.c
index 31bb48b9dda..9bb1a28872c 100644
--- a/usr.sbin/dhcpd/confpars.c
+++ b/usr.sbin/dhcpd/confpars.c
@@ -91,8 +91,8 @@ int readconf ()
 
 /* lease-file :== lease-declarations EOF
    lease-statments :== <nil>
-   		     | lease-declaration
-		     | lease-declarations lease-declaration */
+		   | lease-declaration
+		   | lease-declarations lease-declaration */
 
 void read_leases ()
 {
@@ -104,7 +104,7 @@ void read_leases ()
 
 	/* Open the lease file.   If we can't open it, fail.   The reason
 	   for this is that although on initial startup, the absence of
-	   a lease file is perfectly benign, if dhcpd has been running 
+	   a lease file is perfectly benign, if dhcpd has been running
 	   and this file is absent, it means that dhcpd tried and failed
 	   to rewrite the lease database.   If we proceed and the
 	   problem which caused the rewrite to fail has been fixed, but no
@@ -141,24 +141,24 @@ void read_leases ()
 /* statement :== parameter | declaration
 
    parameter :== timestamp
-   	       | DEFAULT_LEASE_TIME lease_time
-	       | MAX_LEASE_TIME lease_time
-	       | DYNAMIC_BOOTP_LEASE_CUTOFF date
-	       | DYNAMIC_BOOTP_LEASE_LENGTH lease_time
-	       | BOOT_UNKNOWN_CLIENTS boolean
-	       | ONE_LEASE_PER_CLIENT boolean
-	       | GET_LEASE_HOSTNAMES boolean
-	       | USE_HOST_DECL_NAME boolean
-	       | NEXT_SERVER ip-addr-or-hostname SEMI
-	       | option_parameter
-	       | SERVER-IDENTIFIER ip-addr-or-hostname SEMI
-	       | FILENAME string-parameter
-	       | SERVER_NAME string-parameter
-	       | hardware-parameter
-	       | fixed-address-parameter
-	       | ALLOW allow-deny-keyword
-	       | DENY allow-deny-keyword
-	       | USE_LEASE_ADDR_FOR_DEFAULT_ROUTE boolean
+	     | DEFAULT_LEASE_TIME lease_time
+	     | MAX_LEASE_TIME lease_time
+	     | DYNAMIC_BOOTP_LEASE_CUTOFF date
+	     | DYNAMIC_BOOTP_LEASE_LENGTH lease_time
+	     | BOOT_UNKNOWN_CLIENTS boolean
+	     | ONE_LEASE_PER_CLIENT boolean
+	     | GET_LEASE_HOSTNAMES boolean
+	     | USE_HOST_DECL_NAME boolean
+	     | NEXT_SERVER ip-addr-or-hostname SEMI
+	     | option_parameter
+	     | SERVER-IDENTIFIER ip-addr-or-hostname SEMI
+	     | FILENAME string-parameter
+	     | SERVER_NAME string-parameter
+	     | hardware-parameter
+	     | fixed-address-parameter
+	     | ALLOW allow-deny-keyword
+	     | DENY allow-deny-keyword
+	     | USE_LEASE_ADDR_FOR_DEFAULT_ROUTE boolean
 
    declaration :== host-declaration
 		 | group-declaration
@@ -327,7 +327,7 @@ int parse_statement (cfile, group, type, host_decl, declaration)
 		switch (token) {
 		      case AUTHORITATIVE:
 			if (type == HOST_DECL)
-			    parse_warn ("authority makes no sense here."); 
+			    parse_warn ("authority makes no sense here.");
 			group -> authoritative = 0;
 			parse_semi (cfile);
 			break;
@@ -337,10 +337,10 @@ int parse_statement (cfile, group, type, host_decl, declaration)
 			break;
 		}
 		break;
-			
+
 	      case AUTHORITATIVE:
 		if (type == HOST_DECL)
-		    parse_warn ("authority makes no sense here."); 
+		    parse_warn ("authority makes no sense here.");
 		group -> authoritative = 1;
 		parse_semi (cfile);
 		break;
@@ -357,7 +357,7 @@ int parse_statement (cfile, group, type, host_decl, declaration)
 			cache -> value, group -> next_server.len);
 		parse_semi (cfile);
 		break;
-			
+
 	      case OPTION:
 		parse_option_param (cfile, group);
 		break;
@@ -370,7 +370,7 @@ int parse_statement (cfile, group, type, host_decl, declaration)
 			tree_cache (tree);
 		token = next_token (&val, cfile);
 		break;
-			
+
 	      case FILENAME:
 		group -> filename = parse_string (cfile);
 		break;
@@ -432,7 +432,7 @@ int parse_statement (cfile, group, type, host_decl, declaration)
 }
 
 /* allow-deny-keyword :== BOOTP
-   			| BOOTING
+			| BOOTING
 			| DYNAMIC_BOOTP
 			| UNKNOWN_CLIENTS */
 
@@ -819,7 +819,7 @@ void parse_group_declaration (cfile, group)
 
 /* ip-addr-or-hostname :== ip-address | hostname
    ip-address :== NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
-   
+
    Parse an ip address or a hostname.   If uniform is zero, put in
    a TREE_LIMIT node to catch hostnames that evaluate to more than
    one IP address. */
@@ -858,8 +858,8 @@ struct tree *parse_ip_addr_or_hostname (cfile, uniform)
 	}
 
 	return rv;
-}	
-	
+}
+
 
 /* fixed-addr-parameter :== ip-addrs-or-hostnames SEMI
    ip-addrs-or-hostnames :== ip-addr-or-hostname
@@ -1017,7 +1017,7 @@ void parse_option_param (cfile, group)
 					return;
 				}
 				break;
-					
+
 			      case 't': /* Text string... */
 				token = next_token (&val, cfile);
 				if (token != STRING
@@ -1130,7 +1130,7 @@ time_t parse_timestamp (cfile)
 	rv = parse_date (cfile);
 	return rv;
 }
-		
+
 /* lease_declaration :== LEASE ip_address LBRACE lease_parameters RBRACE
 
    lease_parameters :== <nil>
@@ -1190,12 +1190,12 @@ struct lease *parse_lease_declaration (cfile)
 				seenbit = 1;
 				lease.starts = t;
 				break;
-			
+
 			      case ENDS:
 				seenbit = 2;
 				lease.ends = t;
 				break;
-				
+
 			      case TIMESTAMP:
 				seenbit = 4;
 				lease.timestamp = t;
diff --git a/usr.sbin/dhcpd/db.c b/usr.sbin/dhcpd/db.c
index dca8fb8ea9d..b2e3f47ea3a 100644
--- a/usr.sbin/dhcpd/db.c
+++ b/usr.sbin/dhcpd/db.c
@@ -245,7 +245,7 @@ void new_lease_file ()
 	if (link (path_dhcpd_db, backfname) == -1)
 		error ("Can't backup lease database %s to %s: %m",
 		       path_dhcpd_db, backfname);
-	
+
 	/* Move in the new file... */
 	if (rename (newfname, path_dhcpd_db) == -1)
 		error ("Can't install new lease database %s to %s: %m",
diff --git a/usr.sbin/dhcpd/dhcp.c b/usr.sbin/dhcpd/dhcp.c
index 56a3c112373..c65396df161 100644
--- a/usr.sbin/dhcpd/dhcp.c
+++ b/usr.sbin/dhcpd/dhcp.c
@@ -265,7 +265,7 @@ void dhcprequest (packet)
 	     packet -> raw -> giaddr.s_addr) ||
 	    (packet -> options [DHO_DHCP_REQUESTED_ADDRESS].len &&
 	     !packet -> raw -> ciaddr.s_addr)) {
-		
+
 		/* If we don't know where it came from but we do know
 		   where it claims to have come from, it didn't come
 		   from there.   Fry it. */
@@ -332,7 +332,7 @@ void dhcprequest (packet)
 	/* If we own the lease that the client is asking for,
 	   and it's already been assigned to the client, ack it. */
 	if (lease &&
-	    ((lease -> uid_len && lease -> uid_len == 
+	    ((lease -> uid_len && lease -> uid_len ==
 	      packet -> options [DHO_DHCP_CLIENT_IDENTIFIER].len &&
 	      !memcmp (packet -> options
 		       [DHO_DHCP_CLIENT_IDENTIFIER].data,
@@ -408,7 +408,7 @@ void dhcprelease (packet)
 
 	/* If we found a lease, release it. */
 	if (lease && lease -> ends > cur_time) {
-		/* first, we ping this lease to see if it's still 
+		/* first, we ping this lease to see if it's still
 		 * there. if it is, we don't release it.
 		 * this avoids the problem of spoofed releases
 		 * being used to liberate addresses from the
@@ -423,7 +423,7 @@ void dhcprelease (packet)
 			      packet -> raw -> giaddr.s_addr
 			      ? inet_ntoa (packet -> raw -> giaddr)
 			      : packet -> interface -> name);
-			
+
 			lease->releasing = 1;
 			add_timeout (cur_time + 1, lease_ping_timeout, lease);
 			icmp_echorequest (&(lease -> ip_addr));
@@ -781,14 +781,14 @@ void ack_lease (packet, lease, offer, when)
 		if (packet -> options [DHO_DHCP_LEASE_TIME].len == 4) {
 			lease_time = getULong
 				(packet -> options [DHO_DHCP_LEASE_TIME].data);
-			
+
 			/* Don't let the client ask for a longer lease than
 			   is supported for this subnet or host. */
 			if (lease_time > max_lease_time)
 				lease_time = max_lease_time;
 		} else
 			lease_time = default_lease_time;
-		
+
 		state -> offered_expiry = cur_time + lease_time;
 		if (when)
 			lt.ends = when;
@@ -1002,7 +1002,7 @@ void ack_lease (packet, lease, offer, when)
 			    (state -> options [i] -> len >
 			     sizeof state -> from.iabuf))
 				goto use_primary;
-			
+
 			state -> from.len = state -> options [i] -> len;
 			memcpy (state -> from.iabuf,
 				state -> options [i] -> value,
@@ -1014,7 +1014,7 @@ void ack_lease (packet, lease, offer, when)
 			offered_lease_time = default_lease_time;
 		else if (state -> offered_expiry - cur_time > max_lease_time)
 			offered_lease_time = max_lease_time;
-		else 
+		else
 			offered_lease_time =
 				state -> offered_expiry - cur_time;
 
@@ -1455,7 +1455,7 @@ struct lease *find_lease (packet, share, ours)
 		     cip.iabuf, cip.len))) {
 		if (ours)
 			*ours = 1;
-		strlcpy (dhcp_message, "requested address is incorrect", 
+		strlcpy (dhcp_message, "requested address is incorrect",
 			sizeof (dhcp_message));
 		return (struct lease *)0;
 	}
@@ -1650,7 +1650,7 @@ struct lease *find_lease (packet, share, ours)
 	   the lease that matched the client identifier. */
 	if (uid_lease) {
 		if (lease) {
-			if (packet -> packet_type == DHCPREQUEST)	
+			if (packet -> packet_type == DHCPREQUEST)
 				release_lease (uid_lease);
 		} else {
 			lease = uid_lease;
@@ -1661,7 +1661,7 @@ struct lease *find_lease (packet, share, ours)
 	/* The lease that matched the hardware address is treated likewise. */
 	if (hw_lease) {
 		if (lease) {
-			if (packet -> packet_type == DHCPREQUEST)	
+			if (packet -> packet_type == DHCPREQUEST)
 				release_lease (hw_lease);
 		} else {
 			lease = hw_lease;
@@ -1707,7 +1707,7 @@ struct lease *mockup_lease (packet, share, hp)
 	struct host_decl *hp;
 {
 	static struct lease mock;
-	
+
 	mock.subnet = find_host_for_network (&hp, &mock.ip_addr, share);
 	if (!mock.subnet)
 		return (struct lease *)0;
diff --git a/usr.sbin/dhcpd/dhcpd.c b/usr.sbin/dhcpd/dhcpd.c
index b7b3aefed93..c22d0641591 100644
--- a/usr.sbin/dhcpd/dhcpd.c
+++ b/usr.sbin/dhcpd/dhcpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.c,v 1.8 2004/04/14 04:21:32 henning Exp $ */
+/*	$OpenBSD: dhcpd.c,v 1.9 2004/04/14 04:34:19 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org>
@@ -196,11 +196,11 @@ lease_pinged(struct iaddr from, u_int8_t *packet, int length)
 	}
 
 	/* At this point it looks like we pinged a lease and got a
-	 * response, which shouldn't have happened. 
+	 * response, which shouldn't have happened.
 	 * if it did it's either one of two two cases:
 	 * 1 - we pinged this lease before offering it and
 	 *     something answered, so we abandon it.
-	 * 2 - we pinged this lease before releasing it 
+	 * 2 - we pinged this lease before releasing it
 	 *     and something answered, so we don't release it.
 	 */
 	if (lp->releasing) {
diff --git a/usr.sbin/dhcpd/dhcpd.h b/usr.sbin/dhcpd/dhcpd.h
index be7e3f3a36f..3b614c63ce4 100644
--- a/usr.sbin/dhcpd/dhcpd.h
+++ b/usr.sbin/dhcpd/dhcpd.h
@@ -267,7 +267,7 @@ struct group {
 	time_t bootp_lease_length;
 
 	char *filename;
-	char *server_name;	
+	char *server_name;
 	struct iaddr next_server;
 
 	int boot_unknown_clients;
@@ -343,7 +343,7 @@ enum dhcp_state {
 	S_REBOOTING,
 	S_INIT,
 	S_SELECTING,
-	S_REQUESTING, 
+	S_REQUESTING,
 	S_BOUND,
 	S_RENEWING,
 	S_REBINDING
diff --git a/usr.sbin/dhcpd/dispatch.c b/usr.sbin/dhcpd/dispatch.c
index df01e73fb71..313e5334563 100644
--- a/usr.sbin/dhcpd/dispatch.c
+++ b/usr.sbin/dhcpd/dispatch.c
@@ -107,7 +107,7 @@ void discover_interfaces (state)
 		    (!(ifa->ifa_flags & IFF_UP) &&
 		     state != DISCOVER_UNCONFIGURED))
 			continue;
-		
+
 		/* See if we've seen an interface that matches this one. */
 		for (tmp = interfaces; tmp; tmp = tmp -> next)
 			if (!strcmp (tmp -> name, ifa -> ifa_name))
@@ -179,7 +179,7 @@ void discover_interfaces (state)
 					subnet -> interface = tmp;
 					subnet -> interface_address = addr;
 				} else if (subnet -> interface != tmp) {
-					warn ("Multiple %s %s: %s %s", 
+					warn ("Multiple %s %s: %s %s",
 					      "interfaces match the",
 					      "same subnet",
 					      subnet -> interface -> name,
@@ -198,7 +198,7 @@ void discover_interfaces (state)
 				if (!share -> interface) {
 					share -> interface = tmp;
 				} else if (share -> interface != tmp) {
-					warn ("Multiple %s %s: %s %s", 
+					warn ("Multiple %s %s: %s %s",
 					      "interfaces match the",
 					      "same shared network",
 					      share -> interface -> name,
@@ -302,8 +302,6 @@ struct interface_info *setup_fallback ()
 
 void reinitialize_interfaces ()
 {
-	struct interface_info *ip;
-
 	interfaces_invalidated = 1;
 }
 
@@ -348,7 +346,7 @@ void dispatch ()
 			/*
 			 * Figure timeout in milliseconds, and check for
 			 * potential overflow, so we can cram into an int
-			 * for poll, while not polling with a negative 
+			 * for poll, while not polling with a negative
 			 * timeout and blocking indefinetely.
 			 */
 
@@ -361,7 +359,7 @@ void dispatch ()
 
 		/* Set up the descriptors to be polled. */
 		i = 0;
-		
+
 		for (l = protocols; l; l = l -> next) {
 			struct interface_info *ip = l -> local;
 			if (ip && (l->handler != got_one || !ip->dead)) {
@@ -372,9 +370,9 @@ void dispatch ()
 			}
 		}
 
-		if (i == 0) 
+		if (i == 0)
 			error("No live interfaces to poll on - exiting.");
-		
+
 		/* Wait for a packet or a timeout... XXX */
 		count = poll (fds, nfds, to_msec);
 
@@ -419,7 +417,7 @@ void got_one (l)
 	size_t result;
 	union {
 		unsigned char packbuf [4095]; /* Packet input buffer.
-					 	 Must be as large as largest
+						Must be as large as largest
 						 possible MTU. */
 		struct dhcp_packet packet;
 	} u;
@@ -427,14 +425,14 @@ void got_one (l)
 
 	if ((result =
 	     receive_packet (ip, u.packbuf, sizeof u, &from, &hfrom)) == -1) {
-		warn ("receive_packet failed on %s: %s", ip -> name, 
+		warn ("receive_packet failed on %s: %s", ip -> name,
 		      strerror(errno));
 		ip->errors++;
-		if ((! interface_status(ip)) 
+		if ((! interface_status(ip))
 		    || (ip->noifmedia && ip->errors > 20)) {
 			/* our interface has gone away. */
 			warn("Interface %s no longer appears valid.",
-			     ip->name); 
+			     ip->name);
 			ip->dead = 1;
 			interfaces_invalidated = 1;
 			close(l->fd);
@@ -462,7 +460,7 @@ interface_status(struct interface_info *ifinfo)
 	int ifsock = ifinfo->rfdesc;
 	struct ifreq ifr;
 	struct ifmediareq ifmr;
-	
+
 	/* get interface flags */
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
@@ -479,7 +477,7 @@ interface_status(struct interface_info *ifinfo)
 		goto inactive;
 	}
 	/* Next, check carrier on the interface, if possible */
-	if (ifinfo->noifmedia) 
+	if (ifinfo->noifmedia)
 		goto active;
 	memset(&ifmr, 0, sizeof(ifmr));
 	strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
@@ -491,7 +489,7 @@ interface_status(struct interface_info *ifinfo)
 			goto active;
 		}
 		/*
-		 * EINVAL (or ENOTTY) simply means that the interface 
+		 * EINVAL (or ENOTTY) simply means that the interface
 		 * does not support the SIOCGIFMEDIA ioctl. We regard it alive.
 		 */
 		ifinfo->noifmedia = 1;
diff --git a/usr.sbin/dhcpd/icmp.c b/usr.sbin/dhcpd/icmp.c
index 167d483c687..882f14638b6 100644
--- a/usr.sbin/dhcpd/icmp.c
+++ b/usr.sbin/dhcpd/icmp.c
@@ -106,7 +106,7 @@ int icmp_echorequest (addr)
 	icmp.icmp_seq = 0;
 #ifdef PTRSIZE_64BIT
 	icmp.icmp_id = (((u_int32_t)(u_int64_t)addr) ^
-  			(u_int32_t)(((u_int64_t)addr) >> 32));
+	    (u_int32_t)(((u_int64_t)addr) >> 32));
 #else
 	icmp.icmp_id = (u_int32_t)addr;
 #endif
diff --git a/usr.sbin/dhcpd/memory.c b/usr.sbin/dhcpd/memory.c
index 9b36410ae4a..e38a249bd12 100644
--- a/usr.sbin/dhcpd/memory.c
+++ b/usr.sbin/dhcpd/memory.c
@@ -92,7 +92,7 @@ void enter_host (hd)
 		if (!tree_evaluate (hd -> group -> options
 				    [DHO_DHCP_CLIENT_IDENTIFIER]))
 			return;
-			
+
 		/* If there's no uid hash, make one; otherwise, see if
 		   there's already an entry in the hash for this host. */
 		if (!host_uid_hash) {
@@ -396,7 +396,7 @@ void enter_subnet (subnet)
 		   first. */
 		if (subnet_inner_than (subnet, scan, 1)) {
 			if (prev) {
-				prev -> next_subnet = subnet; 
+				prev -> next_subnet = subnet;
 			} else
 				subnets = subnet;
 			subnet -> next_subnet = scan;
@@ -409,7 +409,7 @@ void enter_subnet (subnet)
 	subnet -> next_subnet = subnets;
 	subnets = subnet;
 }
-	
+
 /* Enter a new shared network into the shared network list. */
 
 void enter_shared_network (share)
@@ -419,7 +419,7 @@ void enter_shared_network (share)
 	share -> next = shared_networks;
 	shared_networks = share;
 }
-	
+
 /* Enter a lease into the system.   This is called by the parser each
    time it reads in a new lease.   If the subnet for that lease has
    already been read in (usually the case), just update that lease;
@@ -557,7 +557,7 @@ int supersede_lease (comp, lease, commit)
 			hw_hash_add (comp);
 		}
 
-		/* Remove the lease from its current place in the 
+		/* Remove the lease from its current place in the
 		   timeout sequence. */
 		if (comp -> prev) {
 			comp -> prev -> next = comp -> next;
@@ -653,7 +653,7 @@ void release_lease (lease)
 }
 
 
-/* Abandon the specified lease for the specified time. sets it's 
+/* Abandon the specified lease for the specified time. sets it's
    particulars to zero, the end time apropriately and re-hash it as
    appropriate. abandons permanently if abtime is 0 */
 
@@ -883,7 +883,7 @@ struct class *find_class (type, name, len)
 					     ? user_class_hash
 					     : vendor_class_hash, name, len);
 	return class;
-}	
+}
 
 struct group *clone_group (group, caller)
 	struct group *group;
diff --git a/usr.sbin/dhcpd/print.c b/usr.sbin/dhcpd/print.c
index 4a80656ab47..155d4c6a688 100644
--- a/usr.sbin/dhcpd/print.c
+++ b/usr.sbin/dhcpd/print.c
@@ -64,12 +64,12 @@ char *print_hw_addr (htype, hlen, data)
 
 			s += strlen (s);
 			slen -= (strlen(s) + 1);
- 			*s++ = ':';
+			*s++ = ':';
 		}
 		*--s = 0;
 	}
 	return habuf;
- bad:	
+ bad:
 	strlcpy (habuf, "<null>", sizeof habuf);
 	return habuf;
 
@@ -83,26 +83,26 @@ void print_lease (lease)
 
 	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>");
-}	
+}
 
 void dump_packet (tp)
 	struct packet *tp;
@@ -162,7 +162,7 @@ void dump_raw (buf, len)
 				return;
 			lbix+=j;
 			llen-=j;
-		} else if ((i & 7) == 0) { 
+		} else if ((i & 7) == 0) {
 			lbuf [lbix++] = ' ';
 			len--;
 		}
diff --git a/usr.sbin/dhcpd/tree.c b/usr.sbin/dhcpd/tree.c
index 76adec88127..d2c91b8c222 100644
--- a/usr.sbin/dhcpd/tree.c
+++ b/usr.sbin/dhcpd/tree.c
@@ -152,7 +152,7 @@ struct tree *tree_concat (left, right)
 		free_tree (right, "tree_concat");
 		return left;
 	}
-			
+
 	/* Otherwise, allocate a new node to concatenate the two. */
 	if (!(nt = new_tree ("tree_concat")))
 		error ("No memory for data tree concatenation node.");
@@ -335,7 +335,7 @@ static time_t do_host_lookup (bufix, bufp, bufcount, dns)
 	/* Count the number of addresses we got... */
 	for (i = 0; h -> h_addr_list [i]; i++)
 		;
-	
+
 	/* Do we need to allocate more memory? */
 	new_len = i * h -> h_length;
 	if (dns -> buf_len < i) {