Changeset 777 for branches/ithildin-1.1

Timestamp:

09/29/06 04:09:24 (6 years ago)

Author:

wd

Message:

• Fix PASS hostmask handling (clear the password after the client_connect

hook).

• Fix bug where 005 numerics had an extra space.

Location:

branches/ithildin-1.1/modules/ircd

Files:

• addons/hostmask.c (modified) (1 diff)
• client.c (modified) (2 diffs)
• support.c (modified) (1 diff)

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

@@ -58 +58 @@
                     (!istr_okay(ircd.maps.host, s) ||
                      strchr(s, '.') == NULL))
-                log_error("hostmask %s is invalid.", s);
-            else
+                log_error("hostmask for class %s is invalid", cls->name);
+            else {
                 strlcpy(mdext(cls, class_hostmask_mdi), s, HOSTLEN + 1);
+                log_debug("setting hostmask for class %s to %s", cls->name,
+                        mdext(cls, class_hostmask_mdi));
+            }
         }
     }

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

@@ -201 +201 @@
             ircd.stats.serv.unkclients--;
 
+        }
+
+        cli->signon = cli->ts = me.now;
+        cli->hops = 0; /* our client, they're 0 hops from us <G> */
+
+        /* only hook for local registration */
+        hook_event(ircd.events.client_connect, cli);
+
+        /* clear the password after client_connect, assume that nothing else
+         * will need to hook it and use it anymore. */
+        if (cp != NULL) {
             /* clean out their password */
             if (cp->pass != NULL) {
@@ -207 +218 @@
             }
         }
-
-        cli->signon = cli->ts = me.now;
-        cli->hops = 0; /* our client, they're 0 hops from us <G> */
-
-    }
-
-    /* do other work now.. */
-    if (MYCLIENT(cli)) {
-        /* only hook for local registration */
-        hook_event(ircd.events.client_connect, cli);
 
         /* accounting stuff */

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

@@ -126 +126 @@
             slen = tc = 0;
         }
-        slen += sprintf(str + slen, " %s", token);
+        
+        /* tricky code here to prevent sending an additional space at the
+         * beginning of the line when one is not needed. */
+        slen += sprintf(str + slen, (slen ? " %s" : "%s"), token);
     }
     /* send remnants */