More stuff for allowing hostnames in <bind> and <link> again - note there is a FIXME...

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 5e437365be0f3a3e8d74c5057bce24517e7f341f..77c2c72b380b682b5519db2ad62c3e8e656bfd5e 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1,21 +1,32 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/* ---------------------------------------------------------------------
+ * 
+ *              +------------------------------------+
+ *              | Inspire Internet Relay Chat Daemon |
+ *              +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *         InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                             E-mail:
+ *                      <brain@chatspike.net>
+ *                      <Craig@chatspike.net>
  *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *  Written by Craig Edwards, Craig McLure, and others.
+ *  This program is free but copyrighted 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, version 2
+ *  (two) ONLY.
  *
- * ---------------------------------------------------
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * ---------------------------------------------------------------------
  */
 
-/* Now with added unF! ;) */
-
 #include <algorithm>
 #include "inspircd_config.h"
 #include "inspircd.h"
@@ -372,7 +383,7 @@ void InspIRCd::erase_module(int j)
        {
                if (v1 == j)
                {
-                       delete *m;
+                       DELETE(*m);
                        modules.erase(m);
                        modules.push_back(NULL);
                        break;
@@ -817,7 +828,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                                                }
                                        }
                                        s->Close();
-                                       delete s;
+                                       DELETE(s);
                                }
                                else if (!s)
                                {
@@ -947,7 +958,7 @@ int main(int argc, char** argv)
        {
                ServerInstance = new InspIRCd(argc, argv);
                ServerInstance->Run();
-               delete ServerInstance;
+               DELETE(ServerInstance);
        }
        catch (std::bad_alloc)
        {