minor spelling fix (no behavior change): s/DURATITION/DURATION/

(pointed out by Ted Lemon)

7 files changed, 46 insertions, 46 deletions

diff --git a/addrconf.c b/addrconf.c
index f1b9d1e..c8e0fc9 100644
--- a/addrconf.c
+++ b/addrconf.c
@@ -119,8 +119,8 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
          * lifetime is greater than the valid lifetime.
 	 * [RFC3315 22.6] 
 	 */
-	if (addr->vltime != DHCP6_DURATITION_INFINITE &&
-	    (addr->pltime == DHCP6_DURATITION_INFINITE ||
+	if (addr->vltime != DHCP6_DURATION_INFINITE &&
+	    (addr->pltime == DHCP6_DURATION_INFINITE ||
 	    addr->pltime > addr->vltime)) {
 		dprintf(LOG_INFO, FNAME, "invalid address %s: "
 		    "pltime (%lu) is larger than vltime (%lu)",
@@ -184,7 +184,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
 	case 0:
 		remove_addr(sa);
 		break;
-	case DHCP6_DURATITION_INFINITE:
+	case DHCP6_DURATION_INFINITE:
 		if (sa->timer)
 			dhcp6_remove_timer(&sa->timer);
 		break;
@@ -257,7 +257,7 @@ duration_addr(iac)
 {
 	struct iactl_na *iac_na = (struct iactl_na *)iac;
 	struct statefuladdr *sa;
-	u_int32_t base = DHCP6_DURATITION_INFINITE, pltime, passed;
+	u_int32_t base = DHCP6_DURATION_INFINITE, pltime, passed;
 	time_t now;
 
 	/* Determine the smallest period until pltime expires. */
@@ -269,7 +269,7 @@ duration_addr(iac)
 		pltime = sa->addr.pltime > passed ?
 		    sa->addr.pltime - passed : 0;
 
-		if (base == DHCP6_DURATITION_INFINITE || pltime < base)
+		if (base == DHCP6_DURATION_INFINITE || pltime < base)
 			base = pltime;
 	}
 
diff --git a/cfparse.y b/cfparse.y
index 4385b39..bda6f04 100644
--- a/cfparse.y
+++ b/cfparse.y
@@ -792,7 +792,7 @@ addressparam:
 			/* validate other parameters later */
 			pconf0.plen = 128; /* XXX this field is ignored */
 			if ($2 < 0)
-				pconf0.pltime = DHCP6_DURATITION_INFINITE;
+				pconf0.pltime = DHCP6_DURATION_INFINITE;
 			else
 				pconf0.pltime = (u_int32_t)$2;
 			pconf0.vltime = pconf0.pltime;
@@ -819,11 +819,11 @@ addressparam:
 			/* validate other parameters later */
 			pconf0.plen = 128; /* XXX */
 			if ($2 < 0)
-				pconf0.pltime = DHCP6_DURATITION_INFINITE;
+				pconf0.pltime = DHCP6_DURATION_INFINITE;
 			else
 				pconf0.pltime = (u_int32_t)$2;
 			if ($3 < 0)
-				pconf0.vltime = DHCP6_DURATITION_INFINITE;
+				pconf0.vltime = DHCP6_DURATION_INFINITE;
 			else
 				pconf0.vltime = (u_int32_t)$3;
 
@@ -852,7 +852,7 @@ prefixparam:
 			/* validate other parameters later */
 			pconf0.plen = $3;
 			if ($4 < 0)
-				pconf0.pltime = DHCP6_DURATITION_INFINITE;
+				pconf0.pltime = DHCP6_DURATION_INFINITE;
 			else
 				pconf0.pltime = (u_int32_t)$4;
 			pconf0.vltime = pconf0.pltime;
@@ -879,11 +879,11 @@ prefixparam:
 			/* validate other parameters later */
 			pconf0.plen = $3;
 			if ($4 < 0)
-				pconf0.pltime = DHCP6_DURATITION_INFINITE;
+				pconf0.pltime = DHCP6_DURATION_INFINITE;
 			else
 				pconf0.pltime = (u_int32_t)$4;
 			if ($5 < 0)
-				pconf0.vltime = DHCP6_DURATITION_INFINITE;
+				pconf0.vltime = DHCP6_DURATION_INFINITE;
 			else
 				pconf0.vltime = (u_int32_t)$5;
 
@@ -916,7 +916,7 @@ poolparam:
 
 			/* validate other parameters later */
 			if ($2 < 0)
-				pool->pltime = DHCP6_DURATITION_INFINITE;
+				pool->pltime = DHCP6_DURATION_INFINITE;
 			else
 				pool->pltime = (u_int32_t)$2;
 			pool->vltime = pool->pltime;
@@ -941,11 +941,11 @@ poolparam:
 
 			/* validate other parameters later */
 			if ($2 < 0)
-				pool->pltime = DHCP6_DURATITION_INFINITE;
+				pool->pltime = DHCP6_DURATION_INFINITE;
 			else
 				pool->pltime = (u_int32_t)$2;
 			if ($3 < 0)
-				pool->vltime = DHCP6_DURATITION_INFINITE;
+				pool->vltime = DHCP6_DURATION_INFINITE;
 			else
 				pool->vltime = (u_int32_t)$3;
 
diff --git a/config.c b/config.c
index a35c50d..11af188 100644
--- a/config.c
+++ b/config.c
@@ -278,8 +278,8 @@ configure_interface(iflist)
 					   		spec->name);
 						goto bad;
 					}
-					if (spec->vltime != DHCP6_DURATITION_INFINITE &&
-						(spec->pltime == DHCP6_DURATITION_INFINITE ||
+					if (spec->vltime != DHCP6_DURATION_INFINITE &&
+						(spec->pltime == DHCP6_DURATION_INFINITE ||
 						spec->pltime > spec->vltime)) {
 						dprintf(LOG_ERR, FNAME, "%s:%d ",
 							configfilename, cfl->line,
@@ -616,8 +616,8 @@ configure_host(hostlist)
 					   		spec->name);
 						goto bad;
 					}
-					if (spec->vltime != DHCP6_DURATITION_INFINITE &&
-						(spec->pltime == DHCP6_DURATITION_INFINITE ||
+					if (spec->vltime != DHCP6_DURATION_INFINITE &&
+						(spec->pltime == DHCP6_DURATION_INFINITE ||
 						spec->pltime > spec->vltime)) {
 						dprintf(LOG_ERR, FNAME, "%s:%d ",
 							configfilename, cfl->line,
@@ -1760,8 +1760,8 @@ add_prefix(head, name, type, prefix0)
 	}
 
 	/* validation about relationship of pltime and vltime */
-	if (oprefix.vltime != DHCP6_DURATITION_INFINITE &&
-	    (oprefix.pltime == DHCP6_DURATITION_INFINITE ||
+	if (oprefix.vltime != DHCP6_DURATION_INFINITE &&
+	    (oprefix.pltime == DHCP6_DURATION_INFINITE ||
 	    oprefix.pltime > oprefix.vltime)) {
 		if (type == DHCP6_LISTVAL_PREFIX6) {
 			dprintf(LOG_NOTICE, FNAME,
diff --git a/dhcp6.h b/dhcp6.h
index b030c53..f2b82f8 100644
--- a/dhcp6.h
+++ b/dhcp6.h
@@ -77,8 +77,8 @@
 #define REL_TIMEOUT	1000	/* 1 sec */
 #define REL_MAX_RC	5
 
-#define DHCP6_DURATITION_INFINITE 0xffffffff
-#define DHCP6_DURATITION_MIN 30
+#define DHCP6_DURATION_INFINITE 0xffffffff
+#define DHCP6_DURATION_MIN 30
 
 #define DHCP6_RELAY_MULTICAST_HOPS 32
 #define DHCP6_RELAY_HOP_COUNT_LIMIT 32
diff --git a/dhcp6c_ia.c b/dhcp6c_ia.c
index 5877729..6877c20 100644
--- a/dhcp6c_ia.c
+++ b/dhcp6c_ia.c
@@ -220,14 +220,14 @@ update_ia(iatype, ialist, ifp, serverid, authparam)
 				duration = 1800; /* 30min. XXX: no rationale */
 
 			if (ia->t1 == 0) {
-				if (duration == DHCP6_DURATITION_INFINITE)
-					ia->t1 = DHCP6_DURATITION_INFINITE;
+				if (duration == DHCP6_DURATION_INFINITE)
+					ia->t1 = DHCP6_DURATION_INFINITE;
 				else
 					ia->t1 = duration / 2;
 			}
 			if (ia->t2 == 0) {
-				if (duration == DHCP6_DURATITION_INFINITE)
-					ia->t2 = DHCP6_DURATITION_INFINITE;
+				if (duration == DHCP6_DURATION_INFINITE)
+					ia->t2 = DHCP6_DURATION_INFINITE;
 				else
 					ia->t2 = duration * 4 / 5;
 			}
@@ -245,17 +245,17 @@ update_ia(iatype, ialist, ifp, serverid, authparam)
 		 * the adjusted values may make some information expire
 		 * without renewal.
 		 */
-		if (ia->t2 < DHCP6_DURATITION_MIN) {
+		if (ia->t2 < DHCP6_DURATION_MIN) {
 			dprintf(LOG_INFO, FNAME, "T1 (%lu) or T2 (%lu) "
 			    "is too small", ia->t1, ia->t2);
-			ia->t2 = DHCP6_DURATITION_MIN;
+			ia->t2 = DHCP6_DURATION_MIN;
 			ia->t1 = ia->t2 * 5 / 8;
 			dprintf(LOG_INFO, "", "  adjusted to %lu and %lu",
 			    ia->t1, ia->t2);
 		}
 
 		/* set up a timer for this IA. */
-		if (ia->t1 == DHCP6_DURATITION_INFINITE) {
+		if (ia->t1 == DHCP6_DURATION_INFINITE) {
 			if (ia->timer)
 				dhcp6_remove_timer(&ia->timer);
 		} else {
diff --git a/dhcp6s.c b/dhcp6s.c
index d92ffef..fa6a105 100644
--- a/dhcp6s.c
+++ b/dhcp6s.c
@@ -2680,7 +2680,7 @@ calc_ia_timo(ia, ialist, client_conf)
 	struct host_conf *client_conf; /* unused yet */
 {
 	struct dhcp6_listval *iav;
-	u_int32_t base = DHCP6_DURATITION_INFINITE;
+	u_int32_t base = DHCP6_DURATION_INFINITE;
 	int iatype;
 
 	iatype = TAILQ_FIRST(ialist)->type;
@@ -2693,7 +2693,7 @@ calc_ia_timo(ia, ialist, client_conf)
 		switch (iatype) {
 		case DHCP6_LISTVAL_PREFIX6:
 		case DHCP6_LISTVAL_STATEFULADDR6:
-			if (base == DHCP6_DURATITION_INFINITE ||
+			if (base == DHCP6_DURATION_INFINITE ||
 			    iav->val_prefix6.pltime < base)
 				base = iav->val_prefix6.pltime;
 			break;
@@ -2709,9 +2709,9 @@ calc_ia_timo(ia, ialist, client_conf)
 		 * We could also set the parameters to 0 if we let the client
 		 * decide the renew timing (not implemented yet).
 		 */
-		if (base == DHCP6_DURATITION_INFINITE) {
-			ia->t1 = DHCP6_DURATITION_INFINITE;
-			ia->t2 = DHCP6_DURATITION_INFINITE;
+		if (base == DHCP6_DURATION_INFINITE) {
+			ia->t1 = DHCP6_DURATION_INFINITE;
+			ia->t2 = DHCP6_DURATION_INFINITE;
 		} else {
 			ia->t1 = base / 2;
 			ia->t2 = (base * 4) / 5;
@@ -2726,7 +2726,7 @@ update_binding_duration(binding)
 {
 	struct dhcp6_list *ia_list = &binding->val_list;
 	struct dhcp6_listval *iav;
-	int duration = DHCP6_DURATITION_INFINITE;
+	int duration = DHCP6_DURATION_INFINITE;
 	u_int32_t past, min_lifetime;
 	time_t now = time(NULL);
 
@@ -2757,7 +2757,7 @@ update_binding_duration(binding)
 			}
 
 			if (min_lifetime == 0 ||
-			    (lifetime != DHCP6_DURATITION_INFINITE &&
+			    (lifetime != DHCP6_DURATION_INFINITE &&
 			    lifetime < min_lifetime))
 				min_lifetime = lifetime;
 		}
@@ -2787,7 +2787,7 @@ add_binding(clientid, btype, iatype, iaid, val0)
 	void *val0;
 {
 	struct dhcp6_binding *binding = NULL;
-	u_int32_t duration = DHCP6_DURATITION_INFINITE;
+	u_int32_t duration = DHCP6_DURATION_INFINITE;
 
 	if ((binding = malloc(sizeof(*binding))) == NULL) {
 		dprintf(LOG_NOTICE, FNAME, "failed to allocate memory");
@@ -2848,7 +2848,7 @@ add_binding(clientid, btype, iatype, iaid, val0)
 	/* calculate duration and start timer accordingly */
 	binding->updatetime = time(NULL);
 	update_binding_duration(binding);
-	if (binding->duration != DHCP6_DURATITION_INFINITE) {
+	if (binding->duration != DHCP6_DURATION_INFINITE) {
 		struct timeval timo;
 
 		binding->timer = dhcp6_add_timer(binding_timo, binding);
@@ -2911,7 +2911,7 @@ update_binding(binding)
 	update_binding_duration(binding);
 
 	/* if the lease duration is infinite, there's nothing to do. */
-	if (binding->duration == DHCP6_DURATITION_INFINITE)
+	if (binding->duration == DHCP6_DURATION_INFINITE)
 		return;
 
 	/* reset the timer with the duration */
@@ -3000,7 +3000,7 @@ binding_timo(arg)
 				return (NULL); /* XXX */
 			}
 
-			if (lifetime != DHCP6_DURATITION_INFINITE &&
+			if (lifetime != DHCP6_DURATION_INFINITE &&
 			    lifetime <= past) {
 				dprintf(LOG_DEBUG, FNAME, "bound prefix %s/%d"
 				    " in %s has expired",
@@ -3030,7 +3030,7 @@ binding_timo(arg)
 	update_binding_duration(binding);
 
 	/* if the lease duration is infinite, there's nothing to do. */
-	if (binding->duration == DHCP6_DURATITION_INFINITE)
+	if (binding->duration == DHCP6_DURATION_INFINITE)
 		return (NULL);
 
 	/* reset the timer with the duration */
diff --git a/prefixconf.c b/prefixconf.c
index 07c9f9b..3fc0358 100644
--- a/prefixconf.c
+++ b/prefixconf.c
@@ -138,8 +138,8 @@ update_prefix(ia, pinfo, pifc, dhcpifp, ctlp, callback)
          * lifetime is greater than the valid lifetime.
 	 * [RFC3315 22.6] 
 	 */
-	if (pinfo->vltime != DHCP6_DURATITION_INFINITE &&
-	    (pinfo->pltime == DHCP6_DURATITION_INFINITE ||
+	if (pinfo->vltime != DHCP6_DURATION_INFINITE &&
+	    (pinfo->pltime == DHCP6_DURATION_INFINITE ||
 	    pinfo->pltime > pinfo->vltime)) {
 		dprintf(LOG_INFO, FNAME, "invalid prefix %s/%d: "
 		    "pltime (%lu) is larger than vltime (%lu)",
@@ -227,7 +227,7 @@ update_prefix(ia, pinfo, pifc, dhcpifp, ctlp, callback)
 	case 0:
 		remove_siteprefix(sp);
 		break;
-	case DHCP6_DURATITION_INFINITE:
+	case DHCP6_DURATION_INFINITE:
 		if (sp->timer)
 			dhcp6_remove_timer(&sp->timer);
 		break;
@@ -310,7 +310,7 @@ duration(iac)
 {
 	struct iactl_pd *iac_pd = (struct iactl_pd *)iac;
 	struct siteprefix *sp;
-	u_int32_t base = DHCP6_DURATITION_INFINITE, pltime, passed;
+	u_int32_t base = DHCP6_DURATION_INFINITE, pltime, passed;
 	time_t now;
 
 	/* Determine the smallest period until pltime expires. */
@@ -322,7 +322,7 @@ duration(iac)
 		pltime = sp->prefix.pltime > passed ?
 		    sp->prefix.pltime - passed : 0;
 
-		if (base == DHCP6_DURATITION_INFINITE || pltime < base)
+		if (base == DHCP6_DURATION_INFINITE || pltime < base)
 			base = pltime;
 	}