Add general::tls_ciphers_oper_only

[solanum.git] / ircd / ircd_parser.y

diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index eb49d7f842c56be7135f3539ed44bc7ff8264ee4..fa8dd3dfb7f5d191bc893558ae91a9cc4271d8c6 100644 (file)
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -13,7 +13,6 @@
 #define WE_ARE_MEMORY_C
 #include "stdinc.h"
 #include "setup.h"
-#include "common.h"
 #include "ircd_defs.h"
 #include "defaults.h"
 #include "client.h"
@@ -59,8 +58,8 @@ time_t conf_find_time(char *name)
 
   for (i = 0; ircd_times[i].name; i++)
     {
-      if (strcasecmp(ircd_times[i].name, name) == 0 ||
-         (ircd_times[i].plural && strcasecmp(ircd_times[i].plural, name) == 0))
+      if (rb_strcasecmp(ircd_times[i].name, name) == 0 ||
+         (ircd_times[i].plural && rb_strcasecmp(ircd_times[i].plural, name) == 0))
        return ircd_times[i].val;
     }
 
@@ -87,7 +86,7 @@ static int    conf_get_yesno_value(char *str)
 
        for (i = 0; yesno[i].word; i++)
        {
-               if (strcasecmp(str, yesno[i].word) == 0)
+               if (rb_strcasecmp(str, yesno[i].word) == 0)
                {
                        return yesno[i].yesno;
                }
@@ -161,7 +160,7 @@ static void add_cur_list(int type, char *str, int number)
 
 %union {
        int             number;
-       char            string[IRCD_BUFSIZE + 1];
+       char            string[1024];
        conf_parm_t *   conf_parm;
 }
 
@@ -243,6 +242,9 @@ single: oneitem
                        {
                                add_cur_list(CF_INT, 0, i);
                        }
+
+                       rb_free($1);
+                       rb_free($3);
                }
        }
        ;
@@ -292,7 +294,7 @@ loadmodule:
                 char *m_bn;
                 m_bn = rb_basename((char *) $2);
 
-                if (findmodule_byname(m_bn) == -1)
+                if (findmodule_byname(m_bn) == NULL)
                {
                    load_one_module($2, MAPI_ORIGIN_EXTENSION, 0);
                }