providers/opm: use a name that makes more sense for this variable

[solanum.git] / ircd / ircd_parser.y

diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index 8987a77d66f8c7b77628b95d333da0324a527b3f..900f5ea5e698a766ef0da7a78fc8f053d80c298c 100644 (file)
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -1,14 +1,11 @@
 /* This code is in the public domain.
  * $Nightmare: nightmare/src/main/parser.y,v 1.2.2.1.2.1 2002/07/02 03:42:10 ejb Exp $
- * $Id: ircd_parser.y 871 2006-02-18 21:56:00Z nenolod $
  */
 
 %{
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <netinet/in.h>
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -16,9 +13,8 @@
 #define WE_ARE_MEMORY_C
 #include "stdinc.h"
 #include "setup.h"
-#include "common.h"
 #include "ircd_defs.h"
-#include "config.h"
+#include "defaults.h"
 #include "client.h"
 #include "modules.h"
 #include "newconf.h"
@@ -164,7 +160,7 @@ static void add_cur_list(int type, char *str, int number)
 
 %union {
        int             number;
-       char            string[IRCD_BUFSIZE + 1];
+       char            string[BUFSIZE + 1];
        conf_parm_t *   conf_parm;
 }
 
@@ -292,14 +288,15 @@ oneitem: qstring
 loadmodule:
          LOADMODULE QSTRING
             {
-              char *m_bn;
-
-              m_bn = rb_basename((char *) $2);
+                char *m_bn;
+                m_bn = rb_basename((char *) $2);
 
-              if (findmodule_byname(m_bn) == -1)
-                 load_one_module($2, 0);
+                if (findmodule_byname(m_bn) == -1)
+               {
+                   load_one_module($2, MAPI_ORIGIN_EXTENSION, 0);
+               }
 
-              rb_free(m_bn);
+                rb_free(m_bn);
            }
          ';'
           ;