--- ircd-hybrid/trunk/src/conf.c	2018/10/28 19:56:32	8606
+++ ircd-hybrid/trunk/src/conf.c	2018/10/29 21:26:54	8607
@@ -404,7 +404,7 @@
     free_dlink_node(node);
 
     if (conf->type == CONF_CLIENT)
-      remove_from_cidr_check(&client_p->ip, conf->class);
+      class_ip_limit_remove(conf->class, (struct sockaddr *)&client_p->ip);
 
     if (--conf->class->ref_count == 0 && conf->class->active == 0)
     {
@@ -430,8 +430,7 @@
     return 1;
 
   if (conf->type == CONF_CLIENT)
-    if (cidr_limit_reached(IsConfExemptLimits(conf),
-                           &client_p->ip, conf->class))
+    if (class_ip_limit_add(conf->class, (struct sockaddr *)&client_p->ip, IsConfExemptLimits(conf)))
       return TOO_MANY;    /* Already at maximum allowed */
 
   conf->class->ref_count++;