free server_p->certfp, allocated in newconf.c

[solanum.git] / ircd / match.c

diff --git a/ircd/match.c b/ircd/match.c
index 165baeabc083c59d90b0033e7127bf8b76d2591f..f1c86d2d1961cebcaa29aa5ab6532df9c6cd5d7e 100644 (file)
--- a/ircd/match.c
+++ b/ircd/match.c
@@ -313,7 +313,7 @@ int comp_with_mask(void *addr, void *dest, unsigned int mask)
        if (memcmp(addr, dest, mask / 8) == 0)
        {
                int n = mask / 8;
-               int m = ((-1) << (8 - (mask % 8)));
+               unsigned char m = (0xFF << (8 - (mask % 8)));
                if (mask % 8 == 0 || (((unsigned char *) addr)[n] & m) == (((unsigned char *) dest)[n] & m))
                {
                        return (1);
@@ -670,7 +670,7 @@ const unsigned char irctoupper_tab[] = {
  * NOTE: RFC 1459 sez: anything but a ^G, comma, or space is allowed
  * for channel names
  */
-const unsigned int CharAttrs[] = {
+unsigned int CharAttrs[] = {
 /* 0  */ CNTRL_C,
 /* 1  */ CNTRL_C | CHAN_C | NONEOS_C,
 /* 2  */ CNTRL_C | CHAN_C | FCHAN_C | NONEOS_C,