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 a8f9ba8d41be4a7c4279fe0579351781432263f2..aa83d59f3b159dea0344a1fdfc6341a30843aa71 100644 (file)
--- 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 fcfc2c13a042c0f16aa1ea8e2b054a3acec5e2b2..1d24c204aa4a3956e6689d9e7a15477f1a7ee718 100644 (file)
--- 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.