mod-python: generalised the setting of the PYTHONPATH environment variable

[irc/evilnet/x3.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index e272957dd33519b083892a4d82ec3072a7e10a86..920ef58148d330a0b574df316aaf00761765f280 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,11 +1,11 @@
-/* main.c - srvx
+/* main.c - X3

  * Copyright 2000-2004 srvx Development Team
  *
  * This file is part of x3.
  *
  * Copyright 2000-2004 srvx Development Team
  *
  * This file is part of x3.
  *

- * srvx is free software; you can redistribute it and/or modify
+ * x3 is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or

  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,


@@ -26,6 +26,7 @@
 #include "modcmd.h"
 #include "saxdb.h"
 #include "sendmail.h"
 #include "modcmd.h"
 #include "saxdb.h"
 #include "sendmail.h"

+#include "spamserv.h"

 #include "shun.h"
 #include "timeq.h"
 
 #include "shun.h"
 #include "timeq.h"
 


@@ -521,21 +522,6 @@ conf_globals(void)
     const char *info;
     dict_t dict;
 
     const char *info;
     dict_t dict;
 

-    info = conf_get_data("services/global/nick", RECDB_QSTRING);
-    if (info && (info[0] == '.'))
-        info = NULL;
-    init_global(info);
-
-    info = conf_get_data("services/nickserv/nick", RECDB_QSTRING);
-    if (info && (info[0] == '.'))
-        info = NULL;
-    init_nickserv(info);
-
-    info = conf_get_data("services/chanserv/nick", RECDB_QSTRING);
-    if (info && (info[0] == '.'))
-        info = NULL;
-    init_chanserv(info);
-

     god_policer_params = policer_params_new();
     if ((dict = conf_get_data("policers/commands-god", RECDB_OBJECT))) {
         dict_foreach(dict, set_policer_param, god_policer_params);
     god_policer_params = policer_params_new();
     if ((dict = conf_get_data("policers/commands-god", RECDB_OBJECT))) {
         dict_foreach(dict, set_policer_param, god_policer_params);


@@ -562,6 +548,26 @@ conf_globals(void)
     if (info && (info[0] == '.'))
         info = NULL;
     init_opserv(info);
     if (info && (info[0] == '.'))
         info = NULL;
     init_opserv(info);

+
+    info = conf_get_data("services/global/nick", RECDB_QSTRING);
+    if (info && (info[0] == '.'))
+        info = NULL;
+    init_global(info);
+
+    info = conf_get_data("services/nickserv/nick", RECDB_QSTRING);
+    if (info && (info[0] == '.'))
+        info = NULL;
+    init_nickserv(info);
+
+    info = conf_get_data("services/chanserv/nick", RECDB_QSTRING);
+    if (info && (info[0] == '.'))
+        info = NULL;
+    init_chanserv(info);
+
+    info = conf_get_data("services/spamserv/nick", RECDB_QSTRING);
+    if (info && (info[0] == '.'))
+        info = NULL;
+    init_spamserv(info);

 }
 
 #ifdef HAVE_SYS_RESOURCE_H
 }
 
 #ifdef HAVE_SYS_RESOURCE_H


@@ -669,7 +675,7 @@ void license() {
     printf("\n"
            "This program is free software; you can redistribute it and/or modify\n"
            "it under the terms of the GNU General Public License as published by\n"
     printf("\n"
            "This program is free software; you can redistribute it and/or modify\n"
            "it under the terms of the GNU General Public License as published by\n"

-           "the Free Software Foundation; either version 2 of the License, or\n"
+           "the Free Software Foundation; either version 3 of the License, or\n"

            "(at your option) any later version.\n"
            "\n"
            "This program is distributed in the hope that it will be useful,\n"
            "(at your option) any later version.\n"
            "\n"
            "This program is distributed in the hope that it will be useful,\n"