2 files changed, 3 insertions, 8 deletions
diff --git a/src/conf.c b/src/conf.c
index b7f6eef..378cb9a 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -432,8 +432,7 @@ attach_iline(struct Client *client_p, struct MaskItem *conf)
 void
 init_ip_hash_table(void)
 {
-  ip_entry_pool = mp_pool_new(sizeof(struct ip_entry),
-    2 * hard_fdlimit);
+  ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
   memset(ip_hash_table, 0, sizeof(ip_hash_table));
 }
 
diff --git a/src/hash.c b/src/hash.c
index 4dad3c7..206d593 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -69,12 +69,8 @@ static struct UserHost *userhostTable[HASHSIZE];
 void
 hash_init(void)
 {
-  /* Default the userhost/namehost sizes to CLIENT_HEAP_SIZE for now,
-   * should be a good close approximation anyway
-   * - Dianora
-   */
-  userhost_pool = mp_pool_new(sizeof(struct UserHost), MP_CHUNK_SIZE_CLIENT);
-  namehost_pool = mp_pool_new(sizeof(struct NameHost), MP_CHUNK_SIZE_CLIENT);
+  userhost_pool = mp_pool_new(sizeof(struct UserHost), MP_CHUNK_SIZE_USERHOST);
+  namehost_pool = mp_pool_new(sizeof(struct NameHost), MP_CHUNK_SIZE_NAMEHOST);
 
   hashf_xor_key = genrand_int32() % 256;  /* better than nothing --adx */
 }