almost editorial stuff

6 files changed, 22 insertions, 22 deletions

diff --git a/server/confpars.c b/server/confpars.c
index f6101b3b..715e6542 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -242,7 +242,7 @@ isc_result_t conf_file_subparse (struct parse *cfile, struct group *group,
 }
 
 /* lease-file :== lease-declarations END_OF_FILE
-   lease-statments :== <nil>
+   lease-statements :== <nil>
    		     | lease-declaration
 		     | lease-declarations lease-declaration */
 
@@ -1850,7 +1850,7 @@ void parse_host_declaration (cfile, group)
 			token = next_token(&val, NULL, cfile);
 			if (token != OPTION) {
 				parse_warn(cfile, 
-					   "host-identifer must be an option");
+					   "host-identifier must be an option");
 				skip_to_rbrace(cfile, 1);
 				break;
 			}
@@ -3022,7 +3022,7 @@ int parse_lease_declaration (struct lease **lp, struct parse *cfile)
 				break;
 
 				/* RESERVED and BOOTP states preserved for
-				 * compatiblity with older versions.
+				 * compatibleness with older versions.
 				 */
 			      case TOKEN_RESERVED:
 				new_state = FTS_ACTIVE;
@@ -4133,7 +4133,7 @@ parse_server_duid(struct parse *cfile) {
  * server-duid llt ethernet|ieee802|fddi 213982198 00:16:6F:49:7D:9B;
  * server-duid ll;
  * server-duid ll ethernet|ieee802|fddi 00:16:6F:49:7D:9B;
- * server-duid en 2495 "enterprise-specific-identifer-1234";
+ * server-duid en 2495 "enterprise-specific-identifier-1234";
  */
 void 
 parse_server_duid_conf(struct parse *cfile) {
diff --git a/server/dhcpd.c b/server/dhcpd.c
index 93dc2c76..904d50d6 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -224,7 +224,7 @@ main(int argc, char **argv) {
 
         /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
            2 (stderr) are open. To do this, we assume that when we
-           open a file the lowest available file decriptor is used. */
+           open a file the lowest available file descriptor is used. */
         fd = open("/dev/null", O_RDWR);
         if (fd == 0)
                 fd = open("/dev/null", O_RDWR);
diff --git a/server/dhcpleasequery.c b/server/dhcpleasequery.c
index c3c0fa77..c46e4acb 100644
--- a/server/dhcpleasequery.c
+++ b/server/dhcpleasequery.c
@@ -139,7 +139,7 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) {
 	struct lease *lease;
 	int want_associated_ip;
 	int assoc_ip_cnt;
-	u_int32_t assoc_ips[40];  /* XXXSK: arbritrary maximum number of IPs */
+	u_int32_t assoc_ips[40];  /* XXXSK: arbitrary maximum number of IPs */
 	const int nassoc_ips = sizeof(assoc_ips) / sizeof(assoc_ips[0]);
 
 	unsigned char dhcpMsgType;
@@ -231,7 +231,7 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) {
 	allow_leasequery = 0;
 
 	/*
-	 * See if we are authorised to do LEASEQUERY.
+	 * See if we are authorized to do LEASEQUERY.
 	 */
 	oc = lookup_option(&server_universe, options, SV_LEASEQUERY);
 	if (oc != NULL) {
diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index 80c2bd11..53df84a5 100644
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -65,13 +65,13 @@ struct reply_state {
 	 */
 	u_int32_t renew, rebind, prefer, valid;
 
-	/* Client-rqeuested valid and preferred lifetimes. */
+	/* Client-requested valid and preferred lifetimes. */
 	u_int32_t client_valid, client_prefer;
 
 	/* Chosen values to transmit for valid and preferred lifetimes. */
 	u_int32_t send_valid, send_prefer;
 
-	/* Index into the data field that has been sonsumed. */
+	/* Index into the data field that has been consumed. */
 	unsigned cursor;
 
 	union reply_buffer {
@@ -1005,7 +1005,7 @@ pick_v6_address(struct iaaddr **addr, struct shared_network *shared_network,
  * reply that contains all that we know about the client's correct lease
  * (or projected lease).
  *
- * Solicit - "Soft" binding, ignore uknown addresses or bindings, just
+ * Solicit - "Soft" binding, ignore unknown addresses or bindings, just
  *	     send what we "may" give them on a request.
  *
  * Request - "Hard" binding, but ignore supplied addresses (just provide what
@@ -1940,7 +1940,7 @@ reply_process_is_addressed(struct reply_state *reply,
 					   reply->opt_state,
 					   scope, oc, MDL) ||
 		    (data.len != 4)) {
-			log_error("reply_process_ia: uanble to "
+			log_error("reply_process_ia: unable to "
 				  "evaluate default lease time");
 			status = ISC_R_FAILURE;
 			goto cleanup;
@@ -1991,7 +1991,7 @@ reply_process_is_addressed(struct reply_state *reply,
 	 * XXX: case where a client first identifies itself using vendor
 	 * XXX: options in a solicit, or request, but later neglects to include
 	 * XXX: these options in a Renew or Rebind.  It is not clear that this
-	 * XXX: is required, and has some startling ramnifications (such as
+	 * XXX: is required, and has some startling ramifications (such as
 	 * XXX: how to recover this dynamic host {} state across restarts).
 	 */
 	if (reply->host != NULL)
@@ -2047,7 +2047,7 @@ reply_process_send_addr(struct reply_state *reply, struct iaddr *addr) {
 	/* Now append the lease. */
 	data.len = IAADDR_OFFSET;
 	if (!buffer_allocate(&data.buffer, data.len, MDL)) {
-		log_error("reply_process_ia: out of memory alloating "
+		log_error("reply_process_ia: out of memory allocating "
 			  "new IAADDR buffer.");
 		status = ISC_R_NOMEMORY;
 		goto cleanup;
@@ -2920,7 +2920,7 @@ exit:
  * address we gave it.
  *
  * Since we're only dealing with fixed leases for now, there's not
- * much we can do, other that log the occurrance.
+ * much we can do, other that log the occurrence.
  * 
  * When we start issuing addresses from pools, then we will have to
  * record our declined addresses and issue another. In general with
@@ -3134,7 +3134,7 @@ dhcpv6_relay_forw(struct data_string *reply_ret, struct packet *packet) {
 	struct data_string interface_id;
 
 	/* 
-	 * Intialize variables for early exit.
+	 * Initialize variables for early exit.
 	 */
 	memset(&enc_opt_data, 0, sizeof(enc_opt_data));
 	enc_packet = NULL;
diff --git a/server/failover.c b/server/failover.c
index 36451fb0..0621077d 100644
--- a/server/failover.c
+++ b/server/failover.c
@@ -168,7 +168,7 @@ isc_result_t find_failover_peer (peer, name, file, line)
    specified for each failover object, there could be as many as one
    listener object for each secondary failover_state object. */
 
-/* This, then, is the implemention of the failover link object. */
+/* This, then, is the implementation of the failover link object. */
 
 isc_result_t dhcp_failover_link_initiate (omapi_object_t *h)
 {
@@ -2121,7 +2121,7 @@ isc_result_t dhcp_failover_peer_state_changed (dhcp_failover_state_t *state,
 			break;
 
 			/* If we're in communications-interrupted and an
-			   amnesiac peer connects, go to the partner_down
+			   amnesic peer connects, go to the partner_down
 			   state immediately. */
 		      case recover:
 			dhcp_failover_set_state (state, partner_down);
@@ -2564,7 +2564,7 @@ isc_result_t dhcp_failover_send_updates (dhcp_failover_state_t *state)
 	if (!state -> link_to_peer)
 		return ISC_R_SUCCESS;
 
-	/* If there are acks pending, transmit them prior to potentialy
+	/* If there are acks pending, transmit them prior to potentially
 	 * sending new updates for the same lease.
 	 */
 	if (state->toack_queue_head != NULL)
@@ -5153,7 +5153,7 @@ isc_result_t dhcp_failover_process_bind_ack (dhcp_failover_state_t *state,
 		write_lease(lease);
 		/* Commit the lease only after a two-second timeout,
 		   so that if we get a bunch of acks in quick
-		   successtion (e.g., when stealing leases from the
+		   succession (e.g., when stealing leases from the
 		   secondary), we do not do an immediate commit for
 		   each one. */
 		add_timeout(cur_time + 2,
diff --git a/server/mdb.c b/server/mdb.c
index 2c3b1053..2604117d 100644
--- a/server/mdb.c
+++ b/server/mdb.c
@@ -382,7 +382,7 @@ isc_result_t enter_host (hd, dynamicp, commit)
 					 hd->host_id_option, MDL);
 			if (!host_new_hash(&h_id_info->values_hash, 
 					   HOST_HASH_SIZE, MDL)) {
-				log_fatal("No memory for host-identifer "
+				log_fatal("No memory for host-identifier "
 					  "option hash.");
 			}
 			h_id_info->next = host_id_info;
@@ -1224,7 +1224,7 @@ int supersede_lease (comp, lease, commit, propogate, pimmediate)
       just_move_it:
 #if defined (FAILOVER_PROTOCOL)
 	/* Atsfp should be cleared upon any state change that implies
-	 * propogation whether supersede_lease was given a copy lease
+	 * propagation whether supersede_lease was given a copy lease
 	 * structure or not (often from the pool_timer()).
 	 */
 	if (propogate)
@@ -2373,7 +2373,7 @@ int lease_enqueue (struct lease *comp)
 	}
 
 	/* This only works during server startup: during runtime, the last
-	 * lease may be dequeued inbetween calls.  If the queue is the same
+	 * lease may be dequeued in between calls.  If the queue is the same
 	 * as was used previously, and the lease structure isn't (this is not
 	 * a re-queue), use that as a starting point for the insertion-sort.
 	 */