X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/63c95a478af1b51ad021abef19f630de189f0229..964a842d8f29eb5767e64d2028a36cc40ccec911:/src/main.c diff --git a/src/main.c b/src/main.c index 3f0c82a..920ef58 100644 --- a/src/main.c +++ b/src/main.c @@ -5,7 +5,7 @@ * * x3 is free software; you can redistribute it and/or modify * 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, @@ -549,11 +549,6 @@ conf_globals(void) info = NULL; init_opserv(info); - info = conf_get_data("services/spamserv/nick", RECDB_QSTRING); - if (info && (info[0] == '.')) - info = NULL; - init_spamserv(info); - info = conf_get_data("services/global/nick", RECDB_QSTRING); if (info && (info[0] == '.')) info = NULL; @@ -568,6 +563,11 @@ conf_globals(void) 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 @@ -675,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" - "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"