Changeset 830 for branches/ithildin-1.1

Timestamp:

01/25/09 23:08:01 (3 years ago)

Author:

wd

Message:

Make ACL username buffer bigger, fix a dumb bug with xinfo privs and
reloads.

Location:

branches/ithildin-1.1/modules/ircd

Files:

• addons/acl.c (modified) (5 diffs)
• addons/acl.h (modified) (1 diff)
• commands/acl.c (modified) (6 diffs)
• commands/akill.c (modified) (5 diffs)
• support.c (modified) (1 diff)

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

@@ -38 +38 @@
 acl_t *create_acl(int stage, int acc, char *host, const char *type, int rule) {
     acl_t *ap, *ap2;
-    char *at, hostcopy[USERLEN + HOSTLEN + 2];
+    char *at, hostcopy[ACL_USERLEN + ACL_HOSTLEN + 2];
     struct acl_list *list;
     
@@ -59 +59 @@
     ap->stage = stage;
     ap->access = acc;
-    strlcpy(hostcopy, host, USERLEN + HOSTLEN + 2);
+    strlcpy(hostcopy, host, ACL_USERLEN + ACL_HOSTLEN + 2);
     at = strchr(hostcopy, '@');
     if (at == NULL)
-        strlcpy(ap->host, hostcopy, HOSTLEN + 1);
+        strlcpy(ap->host, hostcopy, ACL_HOSTLEN + 1);
     else {
         *at = '\0';
-        strlcpy(ap->user, hostcopy, USERLEN + 1);
-        strlcpy(ap->host, at + 1, HOSTLEN + 1);
+        strlcpy(ap->user, hostcopy, ACL_USERLEN + 1);
+        strlcpy(ap->host, at + 1, ACL_HOSTLEN + 1);
     }
     ap->type = strdup(type);
@@ -156 +156 @@
         int rule, char *pass, char *info) {
     struct acl_list *list;
-    char *at, hostcopy[USERLEN + HOSTLEN + 2], user[USERLEN + 1];
-    char host[HOSTLEN + 1];
+    char *at, hostcopy[ACL_USERLEN + ACL_HOSTLEN + 2], user[ACL_USERLEN + 1];
+    char host[ACL_HOSTLEN + 1];
     acl_t *ap;
 
     
     /* extract user@host data */
-    strlcpy(hostcopy, hostmask, USERLEN + HOSTLEN + 2);
+    strlcpy(hostcopy, hostmask, ACL_USERLEN + ACL_HOSTLEN + 2);
     at = strchr(hostcopy, '@');
     if (at == NULL) {
         *user = '\0';
-        strlcpy(host, hostcopy, HOSTLEN + 1);
+        strlcpy(host, hostcopy, ACL_HOSTLEN + 1);
     } else {
         *at = '\0';
-        strlcpy(user, hostcopy, USERLEN + 1);
-        strlcpy(host, at + 1, HOSTLEN + 1);
+        strlcpy(user, hostcopy, ACL_USERLEN + 1);
+        strlcpy(host, at + 1, ACL_HOSTLEN + 1);
     }
 
@@ -348 +348 @@
     connection_t  *cp = (connection_t  *)data;
     uint32_t hash, iphash;
-    char ip[HOSTLEN + 1];
-
-    get_socket_address(isock_raddr(cp->sock), ip, HOSTLEN + 1, NULL);
+    char ip[ACL_HOSTLEN + 1];
+
+    get_socket_address(isock_raddr(cp->sock), ip, ACL_HOSTLEN + 1, NULL);
 
     hash = get_acl_hash(cp->host);
@@ -392 +392 @@
     connection_t  *cp = (connection_t  *)data;
     uint32_t hash, iphash;
-    char ip[HOSTLEN + 1];
+    char ip[ACL_HOSTLEN + 1];
     void *ret = NULL;
 
-    get_socket_address(isock_raddr(cp->sock), ip, HOSTLEN + 1, NULL);
+    get_socket_address(isock_raddr(cp->sock), ip, ACL_HOSTLEN + 1, NULL);
 
     hash = get_acl_hash(cp->host);

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

@@ -24 +24 @@
     uint32_t hash;                  /* hash of the acl */
 
+#define ACL_USERLEN (USERLEN * 2)
+#define ACL_HOSTLEN HOSTLEN
+
     class_t *cls;                   /* the class clients in the ACL are
                                        placed in (optional) */
-    char    user[USERLEN + 1];      /* username to match against (optional) */
-    char    host[HOSTLEN + 1];      /* hostname/mask to match against */
+    char    user[ACL_USERLEN + 1];      /* username to match against (optional) */
+    char    host[ACL_HOSTLEN + 1];      /* hostname/mask to match against */
     char    *reason;                /* ban reason */
     char    *info;                  /* "info" line to match against (stage 3

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

@@ -49 +49 @@
     int oarg = 1;
     const char *type = acl_acl_type;
-    char mask[USERLEN + HOSTLEN + 2];
+    char mask[ACL_USERLEN + ACL_HOSTLEN + 2];
     int stage = -1;
     int acc = -1;
@@ -77 +77 @@
         stage = ACL_STAGE_REGISTER;
         acc = ACL_DENY;
-        strlcpy(mask, argv[oarg++], USERLEN + HOSTLEN + 2);
+        strlcpy(mask, argv[oarg++], ACL_USERLEN + ACL_HOSTLEN + 2);
         if (argc > oarg)
             strlcpy(reason, argv[oarg], XINFO_LEN);
@@ -92 +92 @@
         stage = ACL_STAGE_REGISTER;
         acc = ACL_DENY;
-        strlcpy(mask, argv[oarg++], USERLEN + HOSTLEN + 2);
+        strlcpy(mask, argv[oarg++], ACL_USERLEN + ACL_HOSTLEN + 2);
     } else if (!strcasecmp(argv[0], "ZLINE")) {
         if (argc <= oarg || (strchr(argv[oarg], '!') != NULL ||
@@ -105 +105 @@
         stage = ACL_STAGE_CONNECT;
         acc = ACL_DENY;
-        strlcpy(mask, argv[oarg++], USERLEN + HOSTLEN + 2);
+        strlcpy(mask, argv[oarg++], ACL_USERLEN + ACL_HOSTLEN + 2);
         if (argc > oarg)
             strlcpy(reason, argv[oarg], XINFO_LEN);
@@ -120 +120 @@
         stage = ACL_STAGE_CONNECT;
         acc = ACL_DENY;
-        strlcpy(mask, argv[oarg++], USERLEN + HOSTLEN + 2);
+        strlcpy(mask, argv[oarg++], ACL_USERLEN + ACL_HOSTLEN + 2);
     } else {
         /* treat it like it was a real ACL command. */
@@ -162 +162 @@
                 oarg++;
                 if (argc > oarg)
-                    strlcpy(mask, argv[oarg++], USERLEN + HOSTLEN + 2);
+                    strlcpy(mask, argv[oarg++], ACL_USERLEN + ACL_HOSTLEN + 2);
                 else {
                     sendto_one(cli, "NOTICE",

branches/ithildin-1.1/modules/ircd/commands/akill.c

@@ -45 +45 @@
 SERVER_COMMAND(akill, 0, 0, 0) {
     acl_t *ap = NULL;
-    char mask[USERLEN + HOSTLEN + 2];
+    char mask[ACL_USERLEN + ACL_HOSTLEN + 2];
 #define ACL_ADD 0
 #define ACL_DEL 1
@@ -93 +93 @@
             reason = argv[6];
         }
-        snprintf(mask, USERLEN + HOSTLEN + 2, "%s@%s", user, host);
+        snprintf(mask, ACL_USERLEN + ACL_HOSTLEN + 2, "%s@%s", user, host);
 
         /* propogate out.  If we're getting data from a 'SHORTAKILL' server
@@ -111 +111 @@
         }
 
-        snprintf(mask, USERLEN + HOSTLEN + 2, "%s@%s", argv[2], argv[1]);
+        snprintf(mask, ACL_USERLEN + ACL_HOSTLEN + 2, "%s@%s", argv[2], argv[1]);
         op = ACL_DEL;
         sendto_serv_butone(sptr, NULL, srv, NULL, "RAKILL", "%s %s", argv[1],
@@ -125 +125 @@
         stage = ACL_STAGE_CONNECT;
         type = acl_szline_type;
-        strlcpy(mask, argv[1], HOSTLEN + 1);
+        strlcpy(mask, argv[1], ACL_HOSTLEN + 1);
         if (argc > 2)
             reason = argv[2];
@@ -143 +143 @@
         stage = ACL_STAGE_CONNECT;
         type = acl_szline_type;
-        strlcpy(mask, argv[1], HOSTLEN + 1);
+        strlcpy(mask, argv[1], ACL_HOSTLEN + 1);
 
         sendto_serv_butone(sptr, NULL, srv, NULL, "UNSZLINE", "%s", argv[1]);

branches/ithildin-1.1/modules/ircd/support.c

@@ -212 +212 @@
         if (xhp->func == func) {
             LIST_REMOVE(xhp, lp);
+            destroy_privilege(xhp->priv);
             free(xhp->desc);
             free(xhp);