Changeset 732 for branches/ithildin-1.1

Timestamp:

05/12/06 03:38:09 (6 years ago)

Author:

wd

Message:

• Make ACL find honor "default rule"
• Update forgotten throttle module from last update.

Location:

branches/ithildin-1.1/modules/ircd/addons

Files:

• acl.c (modified) (2 diffs)
• throttle.c (modified) (1 diff)

branches/ithildin-1.1/modules/ircd/addons/acl.c

@@ -160 +160 @@
     acl_t *ap;
 
+    
     /* extract user@host data */
     strlcpy(hostcopy, hostmask, USERLEN + HOSTLEN + 2);
@@ -171 +172 @@
         strlcpy(host, at + 1, HOSTLEN + 1);
     }
+
+    if (rule == ACL_DEFAULT_RULE)
+        rule = acl.default_rule;
 
     if (stage == ACL_STAGE_CONNECT)

branches/ithildin-1.1/modules/ircd/addons/throttle.c

@@ -165 +165 @@
     if (tp->banned + len >= me.now)  {
         if ((ap = find_acl(ACL_STAGE_CONNECT, ACL_DENY, cp->host,
-                        throttle_acl_type, NULL, NULL)) == NULL) {
+                        throttle_acl_type, ACL_DEFAULT_RULE, NULL, NULL)) == NULL) {
             ap = create_acl(ACL_STAGE_CONNECT, ACL_DENY, cp->host,
                     throttle_acl_type, ACL_DEFAULT_RULE);