From: Shane Kerr <shane@isc.org>
Date: Fri, 18 May 2007 14:45:23 +0000 (+0000)
Subject: Merge errors from rt16849. Must remember to use "-u" when I'm making
X-Git-Tag: v4_0_0a1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=727cae264f17b12455fc3805e1b79c34134b7dac;p=thirdparty%2Fdhcp.git

Merge errors from rt16849. Must remember to use "-u" when I'm making
diffs. :(
---

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index a8f9ba8d4..aa83d59f3 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -1252,7 +1252,6 @@ typedef unsigned char option_mask [16];
 						/* these are referenced */
 typedef struct hash_table ia_na_hash_t;
 typedef struct hash_table iaaddr_hash_t;
-	int num_inactive;			/* count of inactive IAADDR */
 
 struct iaaddr {
 	int refcnt;				/* reference count */
@@ -1289,6 +1288,7 @@ struct ipv6_pool {
 	iaaddr_hash_t *addrs;			/* non-free IAADDR */
 	int num_active;				/* count of active IAADDR */
 	isc_heap_t *active_timeouts;		/* timeouts for active leases */
+	int num_inactive;			/* count of inactive IAADDR */
 	isc_heap_t *inactive_timeouts;		/* timeouts for expired or 
 						   released leases */
 	struct shared_network *shared_network;	/* shared_network for 
diff --git a/server/mdb6.c b/server/mdb6.c
index fcfc2c13a..1d24c204a 100644
--- a/server/mdb6.c
+++ b/server/mdb6.c
@@ -330,6 +330,7 @@ ia_na_remove_iaaddr(struct ia_na *ia_na, struct iaaddr *iaaddr,
 	log_error("%s(%d): IAADDR not in IA_NA", file, line);
 }
 
+/*
  * Remove all addresses from an IA_NA.
  */
 void
@@ -342,7 +343,6 @@ ia_na_remove_all_iaaddr(struct ia_na *ia_na, const char *file, int line) {
 	ia_na->num_iaaddr = 0;
 }
 
-/*
 /*
  * Helper function for lease heaps.
  * Makes the top of the heap the oldest lease.