resolved all patch conflicts and removed all guards, except for hidebanowner.patch

diff --git a/accountcollision.patch b/accountcollision.patch
index 148e7f25a9f7a801b88a4e146e972d3c32090778..dcba2515b05851b3708f5e88a264a53445162657 100644 (file)
--- a/accountcollision.patch
+++ b/accountcollision.patch
@@ -11,21 +11,21 @@ ircd/s_err.c
 ircd/m_account.c
   add the account collision kills
 
-diff -r 981169e4fc94 include/ircd_features.h
---- a/include/ircd_features.h  Sat Jan 24 12:58:40 2009 +0100
-+++ b/include/ircd_features.h  Sat Jan 24 19:16:22 2009 +0100
-@@ -101,6 +101,7 @@
-   FEAT_IRCD_RES_TIMEOUT,
+diff -r 4599c781548c include/ircd_features.h
+--- a/include/ircd_features.h  Tue Jan 27 18:15:32 2009 +0100
++++ b/include/ircd_features.h  Tue Jan 27 18:19:05 2009 +0100
+@@ -102,6 +102,7 @@
    FEAT_AUTH_TIMEOUT,
    FEAT_ANNOUNCE_INVITES,
+   FEAT_WELCOME,
 +  FEAT_ACCOUNT_COLLISION_KILLS,
  
    /* features that affect all operators */
    FEAT_EXTENDED_CHECKCMD,
-diff -r 981169e4fc94 include/numeric.h
---- a/include/numeric.h        Sat Jan 24 12:58:40 2009 +0100
-+++ b/include/numeric.h        Sat Jan 24 19:16:22 2009 +0100
-@@ -357,6 +357,7 @@
+diff -r 4599c781548c include/numeric.h
+--- a/include/numeric.h        Tue Jan 27 18:15:32 2009 +0100
++++ b/include/numeric.h        Tue Jan 27 18:19:05 2009 +0100
+@@ -358,6 +358,7 @@
  /*    ERR_NORULES          434   unreal */
  /*      ERR_SERVICECONFUSED  435 ? */
  /*    ERR_BANONCHAN        435   dalnet */
@@ -33,20 +33,20 @@ diff -r 981169e4fc94 include/numeric.h
  #define ERR_NICKCOLLISION    436
  #define ERR_BANNICKCHANGE    437        /* Undernet extension */
       /* ERR_UNAVAILRESOURCE  437           IRCnet extension */
-diff -r 981169e4fc94 ircd/ircd_features.c
---- a/ircd/ircd_features.c     Sat Jan 24 12:58:40 2009 +0100
-+++ b/ircd/ircd_features.c     Sat Jan 24 19:16:22 2009 +0100
-@@ -355,6 +355,7 @@
-   F_I(IRCD_RES_TIMEOUT, 0, 4, 0),
+diff -r 4599c781548c ircd/ircd_features.c
+--- a/ircd/ircd_features.c     Tue Jan 27 18:15:32 2009 +0100
++++ b/ircd/ircd_features.c     Tue Jan 27 18:19:05 2009 +0100
+@@ -356,6 +356,7 @@
    F_I(AUTH_TIMEOUT, 0, 9, 0),
    F_B(ANNOUNCE_INVITES, 0, 0, 0),
+   F_B(WELCOME, 0, 1, 0),
 +  F_B(ACCOUNT_COLLISION_KILLS, 0, 0, 0),
  
    /* features that affect all operators */
    F_B(EXTENDED_CHECKCMD, 0, 0, 0),
-diff -r 981169e4fc94 ircd/m_account.c
---- a/ircd/m_account.c Sat Jan 24 12:58:40 2009 +0100
-+++ b/ircd/m_account.c Sat Jan 24 19:16:22 2009 +0100
+diff -r 4599c781548c ircd/m_account.c
+--- a/ircd/m_account.c Tue Jan 27 18:15:32 2009 +0100
++++ b/ircd/m_account.c Tue Jan 27 18:19:05 2009 +0100
 @@ -82,10 +82,12 @@
  
  #include "client.h"
@@ -110,9 +110,9 @@ diff -r 981169e4fc94 ircd/m_account.c
  
      cli_user(acptr)->acc_flags = acc_flags;
  
-diff -r 981169e4fc94 ircd/s_err.c
---- a/ircd/s_err.c     Sat Jan 24 12:58:40 2009 +0100
-+++ b/ircd/s_err.c     Sat Jan 24 19:16:22 2009 +0100
+diff -r 4599c781548c ircd/s_err.c
+--- a/ircd/s_err.c     Tue Jan 27 18:15:32 2009 +0100
++++ b/ircd/s_err.c     Tue Jan 27 18:19:05 2009 +0100
 @@ -902,7 +902,7 @@
  /* 434 */
    { 0 },

diff --git a/split.patch b/split.patch
index 854712e9937b15de9cb24ffb301141288cd7b448..2975115950bacdb8a0693644a68bc0e756fdf14a 100644 (file)
--- a/split.patch
+++ b/split.patch
@@ -7,9 +7,9 @@ Add split.c split.h m_split.c
 
 NOTE: feature SPLIT is default enabled as that is just easier when working on this patch.
 
-diff -r 66ed26620ed2 doc/api/log.txt
---- a/doc/api/log.txt  Mon Jan 26 12:32:39 2009 +0100
-+++ b/doc/api/log.txt  Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d doc/api/log.txt
+--- a/doc/api/log.txt  Tue Jan 27 18:19:11 2009 +0100
++++ b/doc/api/log.txt  Tue Jan 27 18:25:58 2009 +0100
 @@ -41,7 +41,7 @@
  
  <enum>
@@ -19,9 +19,9 @@ diff -r 66ed26620ed2 doc/api/log.txt
    LS_OPERKILL, LS_SERVKILL, LS_USER, LS_OPER, LS_RESOLVER, LS_SOCKET,
    LS_DEBUG, LS_OLDLOG,
    LS_LAST_SYSTEM
-diff -r 66ed26620ed2 include/handlers.h
---- a/include/handlers.h       Mon Jan 26 12:32:39 2009 +0100
-+++ b/include/handlers.h       Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d include/handlers.h
+--- a/include/handlers.h       Tue Jan 27 18:19:11 2009 +0100
++++ b/include/handlers.h       Tue Jan 27 18:25:58 2009 +0100
 @@ -139,6 +139,7 @@
  extern int m_registered(struct Client*, struct Client*, int, char*[]);
  extern int m_sethost(struct Client*, struct Client*, int, char*[]);
@@ -30,7 +30,7 @@ diff -r 66ed26620ed2 include/handlers.h
  extern int m_stats(struct Client*, struct Client*, int, char*[]);
  extern int m_time(struct Client*, struct Client*, int, char*[]);
  extern int m_topic(struct Client*, struct Client*, int, char*[]);
-@@ -178,6 +179,7 @@
+@@ -179,6 +180,7 @@
  extern int mo_rping(struct Client*, struct Client*, int, char*[]);
  extern int mo_set(struct Client*, struct Client*, int, char*[]);
  extern int mo_settime(struct Client*, struct Client*, int, char*[]);
@@ -38,7 +38,7 @@ diff -r 66ed26620ed2 include/handlers.h
  extern int mo_squit(struct Client*, struct Client*, int, char*[]);
  extern int mo_stats(struct Client*, struct Client*, int, char*[]);
  extern int mo_trace(struct Client*, struct Client*, int, char*[]);
-@@ -232,6 +234,7 @@
+@@ -234,6 +236,7 @@
  extern int ms_sethost(struct Client*, struct Client*, int, char*[]);
  extern int ms_settime(struct Client*, struct Client*, int, char*[]);
  extern int ms_silence(struct Client*, struct Client*, int, char*[]);
@@ -46,10 +46,10 @@ diff -r 66ed26620ed2 include/handlers.h
  extern int ms_squit(struct Client*, struct Client*, int, char*[]);
  extern int ms_stats(struct Client*, struct Client*, int, char*[]);
  extern int ms_topic(struct Client*, struct Client*, int, char*[]);
-diff -r 66ed26620ed2 include/ircd_features.h
---- a/include/ircd_features.h  Mon Jan 26 12:32:39 2009 +0100
-+++ b/include/ircd_features.h  Mon Jan 26 12:35:59 2009 +0100
-@@ -111,6 +111,10 @@
+diff -r 2267c134dc0d include/ircd_features.h
+--- a/include/ircd_features.h  Tue Jan 27 18:19:11 2009 +0100
++++ b/include/ircd_features.h  Tue Jan 27 18:25:58 2009 +0100
+@@ -112,6 +112,10 @@
    FEAT_SETHOST_USER,
    FEAT_SETHOST_AUTO,
  
@@ -60,7 +60,7 @@ diff -r 66ed26620ed2 include/ircd_features.h
    /* HEAD_IN_SAND Features */
    FEAT_HIS_SNOTICES,
    FEAT_HIS_SNOTICES_OPER_ONLY,
-@@ -138,6 +142,7 @@
+@@ -139,6 +143,7 @@
    FEAT_HIS_STATS_q,
    FEAT_HIS_STATS_R,
    FEAT_HIS_STATS_r,
@@ -68,9 +68,9 @@ diff -r 66ed26620ed2 include/ircd_features.h
    FEAT_HIS_STATS_s,
    FEAT_HIS_STATS_t,
    FEAT_HIS_STATS_T,
-diff -r 66ed26620ed2 include/ircd_log.h
---- a/include/ircd_log.h       Mon Jan 26 12:32:39 2009 +0100
-+++ b/include/ircd_log.h       Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d include/ircd_log.h
+--- a/include/ircd_log.h       Tue Jan 27 18:19:11 2009 +0100
++++ b/include/ircd_log.h       Tue Jan 27 18:25:58 2009 +0100
 @@ -55,6 +55,7 @@
    LS_OPERMODE,   /**< Uses of OPMODE, CLEARMODE< etc. */
    LS_GLINE,      /**< Adding, (de-)activating or removing GLINEs. */
@@ -79,10 +79,10 @@ diff -r 66ed26620ed2 include/ircd_log.h
    LS_WHO,        /**< Use of extended WHO privileges. */
    LS_NETWORK,    /**< New server connections. */
    LS_OPERKILL,   /**< Kills by IRC operators. */
-diff -r 66ed26620ed2 include/msg.h
---- a/include/msg.h    Mon Jan 26 12:32:39 2009 +0100
-+++ b/include/msg.h    Mon Jan 26 12:35:59 2009 +0100
-@@ -332,6 +332,10 @@
+diff -r 2267c134dc0d include/msg.h
+--- a/include/msg.h    Tue Jan 27 18:19:11 2009 +0100
++++ b/include/msg.h    Tue Jan 27 18:25:58 2009 +0100
+@@ -336,6 +336,10 @@
  #define TOK_JUPE                "JU"
  #define CMD_JUPE              MSG_JUPE, TOK_JUPE
  
@@ -93,18 +93,18 @@ diff -r 66ed26620ed2 include/msg.h
  #define MSG_OPMODE              "OPMODE"        /* OPMO */
  #define TOK_OPMODE              "OM"
  #define CMD_OPMODE            MSG_OPMODE, TOK_OPMODE
-diff -r 66ed26620ed2 include/numeric.h
---- a/include/numeric.h        Mon Jan 26 12:32:39 2009 +0100
-+++ b/include/numeric.h        Mon Jan 26 12:35:59 2009 +0100
-@@ -117,6 +117,7 @@
-       RPL_STATSVLINE       227           unreal */
+diff -r 2267c134dc0d include/numeric.h
+--- a/include/numeric.h        Tue Jan 27 18:19:11 2009 +0100
++++ b/include/numeric.h        Tue Jan 27 18:25:58 2009 +0100
+@@ -118,6 +118,7 @@
  #define RPL_STATSALINE       226        /* Hybrid, Undernet */
+ #define RPL_STATSWELCOME     227        /* QuakeNet extension */
  #define RPL_STATSQLINE       228        /* Undernet extension */
 +#define RPL_STATSSPLIT       229        /* QuakeNet extension */
  #define RPL_STATSHEADER      230        /* QuakeNet extension */
  
  /*      RPL_SERVICEINFO      231      unused */
-@@ -178,6 +179,8 @@
+@@ -179,6 +180,8 @@
  #define RPL_STATSDLINE       275        /* Undernet extension */
  #define RPL_STATSRLINE       276        /* Undernet extension */
  
@@ -113,17 +113,17 @@ diff -r 66ed26620ed2 include/numeric.h
  #define RPL_GLIST            280        /* Undernet extension */
  #define RPL_ENDOFGLIST       281        /* Undernet extension */
  #define RPL_JUPELIST         282        /* Undernet extension - jupe -Kev */
-@@ -442,6 +445,7 @@
- /*      ERR_GHOSTEDCLIENT    503           efnet */
- /*    ERR_VWORLDWARN       503           austnet */
+@@ -445,6 +448,7 @@
+ 
+ #define ERR_NOSUCHWELCOME    509        /* QuakeNet extension */
  
 +#define ERR_NOSUCHSPLIT      510        /* QuakeNet extension */
  #define ERR_SILELISTFULL     511        /* Undernet extension */
  /*      ERR_NOTIFYFULL       512           aircd */
  /*    ERR_TOOMANYWATCH     512           Numeric List: Dalnet */
-diff -r 66ed26620ed2 include/split.h
+diff -r 2267c134dc0d include/split.h
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/split.h  Mon Jan 26 12:35:59 2009 +0100
++++ b/include/split.h  Tue Jan 27 18:25:58 2009 +0100
 @@ -0,0 +1,106 @@
 +#ifndef INCLUDED_split_h
 +#define INCLUDED_split_h
@@ -231,9 +231,9 @@ diff -r 66ed26620ed2 include/split.h
 +extern int split_memory_count(size_t *sp_size);
 +
 +#endif /* INCLUDED_split_h */
-diff -r 66ed26620ed2 ircd/Makefile.in
---- a/ircd/Makefile.in Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/Makefile.in Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/Makefile.in
+--- a/ircd/Makefile.in Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/Makefile.in Tue Jan 27 18:25:58 2009 +0100
 @@ -173,6 +173,7 @@
        m_sethost.c \
        m_settime.c \
@@ -242,15 +242,15 @@ diff -r 66ed26620ed2 ircd/Makefile.in
        m_squit.c \
        m_stats.c \
        m_time.c \
-@@ -212,6 +213,7 @@
+@@ -213,6 +214,7 @@
        s_stats.c \
        s_user.c \
        send.c \
 +      split.c \
        uping.c \
        userload.c \
-       whocmds.c \
-@@ -1052,6 +1054,15 @@
+       welcome.c \
+@@ -1054,6 +1056,15 @@
    ../include/ircd_chattr.h ../include/list.h ../include/msg.h \
    ../include/numeric.h ../include/numnicks.h ../include/s_user.h \
    ../include/send.h ../include/struct.h
@@ -266,7 +266,7 @@ diff -r 66ed26620ed2 ircd/Makefile.in
  m_squit.o: m_squit.c ../config.h ../include/client.h \
    ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
    ../include/ircd_events.h ../config.h ../include/ircd_handler.h \
-@@ -1325,6 +1336,7 @@
+@@ -1332,6 +1343,7 @@
    ../include/msgq.h ../include/numeric.h ../include/numnicks.h \
    ../include/res.h ../include/s_bsd.h ../include/s_conf.h \
    ../include/s_user.h ../include/s_stats.h ../include/send.h \
@@ -274,7 +274,7 @@ diff -r 66ed26620ed2 ircd/Makefile.in
    ../include/struct.h ../include/sys.h ../include/whowas.h
  s_err.o: s_err.c ../config.h ../include/numeric.h ../include/ircd_log.h \
    ../include/s_debug.h ../config.h ../include/ircd_defs.h
-@@ -1410,6 +1422,16 @@
+@@ -1417,6 +1429,16 @@
    ../include/msg.h ../include/numnicks.h ../include/parse.h \
    ../include/s_bsd.h ../include/s_debug.h ../include/s_misc.h \
    ../include/s_user.h ../include/struct.h ../include/sys.h
@@ -291,9 +291,9 @@ diff -r 66ed26620ed2 ircd/Makefile.in
  uping.o: uping.c ../config.h ../include/uping.h ../include/ircd_defs.h \
    ../include/ircd_events.h ../config.h ../include/res.h \
    ../include/client.h ../include/dbuf.h ../include/msgq.h \
-diff -r 66ed26620ed2 ircd/ircd.c
---- a/ircd/ircd.c      Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/ircd.c      Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/ircd.c
+--- a/ircd/ircd.c      Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/ircd.c      Tue Jan 27 18:25:58 2009 +0100
 @@ -55,6 +55,7 @@
  #include "s_misc.h"
  #include "s_stats.h"
@@ -312,10 +312,10 @@ diff -r 66ed26620ed2 ircd/ircd.c
    event_loop();
  
    return 0;
-diff -r 66ed26620ed2 ircd/ircd_features.c
---- a/ircd/ircd_features.c     Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/ircd_features.c     Mon Jan 26 12:35:59 2009 +0100
-@@ -365,6 +365,10 @@
+diff -r 2267c134dc0d ircd/ircd_features.c
+--- a/ircd/ircd_features.c     Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/ircd_features.c     Tue Jan 27 18:25:58 2009 +0100
+@@ -366,6 +366,10 @@
    F_B(SETHOST_USER, 0, 0, 0),
    F_B(SETHOST_AUTO, 0, 0, 0),
  
@@ -326,7 +326,7 @@ diff -r 66ed26620ed2 ircd/ircd_features.c
    /* HEAD_IN_SAND Features */
    F_B(HIS_SNOTICES, 0, 1, 0),
    F_B(HIS_SNOTICES_OPER_ONLY, 0, 1, 0),
-@@ -392,6 +396,7 @@
+@@ -393,6 +397,7 @@
    F_B(HIS_STATS_q, 0, 1, 0),
    F_B(HIS_STATS_R, 0, 1, 0),
    F_B(HIS_STATS_r, 0, 1, 0),
@@ -334,9 +334,9 @@ diff -r 66ed26620ed2 ircd/ircd_features.c
    F_B(HIS_STATS_s, 0, 1, 0),
    F_B(HIS_STATS_t, 0, 1, 0),
    F_B(HIS_STATS_T, 0, 1, 0),
-diff -r 66ed26620ed2 ircd/ircd_log.c
---- a/ircd/ircd_log.c  Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/ircd_log.c  Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/ircd_log.c
+--- a/ircd/ircd_log.c  Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/ircd_log.c  Tue Jan 27 18:25:58 2009 +0100
 @@ -154,6 +154,7 @@
    S(OPERMODE, -1, SNO_HACK4),
    S(GLINE, -1, SNO_GLINE),
@@ -345,9 +345,9 @@ diff -r 66ed26620ed2 ircd/ircd_log.c
    S(WHO, -1, 0),
    S(NETWORK, -1, SNO_NETWORK),
    S(OPERKILL, -1, 0),
-diff -r 66ed26620ed2 ircd/m_endburst.c
---- a/ircd/m_endburst.c        Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/m_endburst.c        Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/m_endburst.c
+--- a/ircd/m_endburst.c        Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/m_endburst.c        Tue Jan 27 18:25:58 2009 +0100
 @@ -85,6 +85,7 @@
  #include "client.h"
  #include "hash.h"
@@ -383,9 +383,9 @@ diff -r 66ed26620ed2 ircd/m_endburst.c
    if (MyConnect(sptr))
      sendcmdto_one(&me, CMD_END_OF_BURST_ACK, sptr, "");
  
-diff -r 66ed26620ed2 ircd/m_reburst.c
---- a/ircd/m_reburst.c Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/m_reburst.c Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/m_reburst.c
+--- a/ircd/m_reburst.c Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/m_reburst.c Tue Jan 27 18:25:58 2009 +0100
 @@ -102,6 +102,7 @@
  #include "ircd_snprintf.h"
  #include "gline.h"
@@ -405,9 +405,9 @@ diff -r 66ed26620ed2 ircd/m_reburst.c
      default:
        break;
    }
-diff -r 66ed26620ed2 ircd/m_server.c
---- a/ircd/m_server.c  Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/m_server.c  Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/m_server.c
+--- a/ircd/m_server.c  Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/m_server.c  Tue Jan 27 18:25:58 2009 +0100
 @@ -47,6 +47,7 @@
  #include "s_misc.h"
  #include "s_serv.h"
@@ -426,9 +426,9 @@ diff -r 66ed26620ed2 ircd/m_server.c
    /*
     * Old sendto_serv_but_one() call removed because we now need to send
     * different names to different servers (domain name matching).
-diff -r 66ed26620ed2 ircd/m_split.c
+diff -r 2267c134dc0d ircd/m_split.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_split.c   Mon Jan 26 12:35:59 2009 +0100
++++ b/ircd/m_split.c   Tue Jan 27 18:25:58 2009 +0100
 @@ -0,0 +1,376 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/m_split.c
@@ -806,9 +806,9 @@ diff -r 66ed26620ed2 ircd/m_split.c
 +
 +  return split_list(sptr, parv[1]);
 +}
-diff -r 66ed26620ed2 ircd/parse.c
---- a/ircd/parse.c     Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/parse.c     Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/parse.c
+--- a/ircd/parse.c     Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/parse.c     Tue Jan 27 18:25:58 2009 +0100
 @@ -505,6 +505,13 @@
      /* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
      { m_unregistered, m_not_oper, ms_jupe, mo_jupe, m_ignore, mh_jupe }
@@ -823,9 +823,9 @@ diff -r 66ed26620ed2 ircd/parse.c
    {
      MSG_OPMODE,
      TOK_OPMODE,
-diff -r 66ed26620ed2 ircd/s_conf.c
---- a/ircd/s_conf.c    Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/s_conf.c    Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/s_conf.c
+--- a/ircd/s_conf.c    Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/s_conf.c    Tue Jan 27 18:25:58 2009 +0100
 @@ -53,6 +53,7 @@
  #include "s_debug.h"
  #include "s_misc.h"
@@ -842,9 +842,9 @@ diff -r 66ed26620ed2 ircd/s_conf.c
  
    return ret;
  }
-diff -r 66ed26620ed2 ircd/s_debug.c
---- a/ircd/s_debug.c   Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/s_debug.c   Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/s_debug.c
+--- a/ircd/s_debug.c   Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/s_debug.c   Tue Jan 27 18:25:58 2009 +0100
 @@ -48,6 +48,7 @@
  #include "s_user.h"
  #include "s_stats.h"
@@ -852,39 +852,40 @@ diff -r 66ed26620ed2 ircd/s_debug.c
 +#include "split.h"
  #include "struct.h"
  #include "sys.h"
- #include "whowas.h"
-@@ -231,7 +232,8 @@
-       aw = 0,                   /* aways set */
+ #include "welcome.h"
+@@ -233,6 +234,7 @@
        wwa = 0,                  /* whowas aways */
        gl = 0,                   /* glines */
--      ju = 0;                   /* jupes */
-+      ju = 0,                   /* jupes */
-+      sp = 0;                   /* split entries */
+       ju = 0,                   /* jupes */
++      sp = 0,                   /* split entries */
+       we = 0;                   /* welcome messages */
  
    size_t chm = 0,               /* memory used by channels */
-       chbm = 0,                 /* memory used by channel bans */
-@@ -244,6 +246,7 @@
+@@ -246,6 +248,7 @@
        wwm = 0,                  /* whowas array memory used */
        glm = 0,                  /* memory used by glines */
        jum = 0,                  /* memory used by jupes */
 +      spm = 0,                  /* memory used by split entries */
+       wem = 0,                  /* memory used by welcome messages */
        com = 0,                  /* memory used by conf lines */
        dbufs_allocated = 0,      /* memory used by dbufs */
-       dbufs_used = 0,           /* memory used by dbufs */
-@@ -348,8 +351,9 @@
+@@ -351,10 +354,11 @@
  
    gl = gline_memory_count(&glm);
    ju = jupe_memory_count(&jum);
 +  sp = split_memory_count(&spm);
+   we = welcome_memory_count(&wem);
    send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
--           ":Glines %d(%zu) Jupes %d(%zu)", gl, glm, ju, jum);
-+           ":Glines %d(%zu) Jupes %d(%zu) Splits %d(%zu)", gl, glm, ju, jum, sp, spm);
+-           ":Glines %d(%zu) Jupes %d(%zu) WelcomeMessages %d(%zu)",
+-           gl, glm, ju, jum, we, wem);
++           ":Glines %d(%zu) Jupes %d(%zu) Splits %d(%zu) WelcomeMessages %d(%zu)",
++           gl, glm, ju, jum, sp, spm, we, wem);
  
    send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
             ":Hash: client %d(%zu), chan is the same", HASHSIZE,
-diff -r 66ed26620ed2 ircd/s_err.c
---- a/ircd/s_err.c     Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/s_err.c     Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/s_err.c
+--- a/ircd/s_err.c     Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/s_err.c     Tue Jan 27 18:25:58 2009 +0100
 @@ -490,7 +490,7 @@
  /* 228 */
    { RPL_STATSQLINE, "Q %s :%s", "228" },
@@ -908,16 +909,16 @@ diff -r 66ed26620ed2 ircd/s_err.c
  /* 281 */
 @@ -1052,7 +1052,7 @@
  /* 509 */
-   { 0 },
+   { ERR_NOSUCHWELCOME, "%s :No such welcome", "509" },
  /* 510 */
 -  { 0 },
 +  { ERR_NOSUCHSPLIT, "%s :No such split", "510" },
  /* 511 */
    { ERR_SILELISTFULL, "%s :Your silence list is full", "511" },
  /* 512 */
-diff -r 66ed26620ed2 ircd/s_misc.c
---- a/ircd/s_misc.c    Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/s_misc.c    Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/s_misc.c
+--- a/ircd/s_misc.c    Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/s_misc.c    Tue Jan 27 18:25:58 2009 +0100
 @@ -53,6 +53,7 @@
  #include "s_stats.h"
  #include "s_user.h"
@@ -950,9 +951,9 @@ diff -r 66ed26620ed2 ircd/s_misc.c
    }
  
    /*
-diff -r 66ed26620ed2 ircd/s_serv.c
---- a/ircd/s_serv.c    Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/s_serv.c    Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/s_serv.c
+--- a/ircd/s_serv.c    Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/s_serv.c    Tue Jan 27 18:25:58 2009 +0100
 @@ -54,6 +54,7 @@
  #include "s_misc.h"
  #include "s_user.h"
@@ -961,17 +962,17 @@ diff -r 66ed26620ed2 ircd/s_serv.c
  #include "struct.h"
  #include "sys.h"
  #include "userload.h"
-@@ -196,6 +197,7 @@
+@@ -197,6 +198,7 @@
     */
    gline_burst(cptr);
    jupe_burst(cptr);
 +  split_burst(cptr);
+   welcome_burst(cptr);
  
    /*
-    * Pass on my client information to the new server
-diff -r 66ed26620ed2 ircd/s_stats.c
---- a/ircd/s_stats.c   Mon Jan 26 12:32:39 2009 +0100
-+++ b/ircd/s_stats.c   Mon Jan 26 12:35:59 2009 +0100
+diff -r 2267c134dc0d ircd/s_stats.c
+--- a/ircd/s_stats.c   Tue Jan 27 18:19:11 2009 +0100
++++ b/ircd/s_stats.c   Tue Jan 27 18:25:58 2009 +0100
 @@ -52,6 +52,7 @@
  #include "s_stats.h"
  #include "s_user.h"
@@ -979,8 +980,8 @@ diff -r 66ed26620ed2 ircd/s_stats.c
 +#include "split.h"
  #include "struct.h"
  #include "userload.h"
- 
-@@ -668,7 +669,10 @@
+ #include "welcome.h"
+@@ -669,7 +670,10 @@
      send_usage, 0,
      "System resource usage (Debug only)." },
  #endif
@@ -992,9 +993,9 @@ diff -r 66ed26620ed2 ircd/s_stats.c
      stats_sline, 0,
      "Spoofed hosts information." },
    { 'T', "motds", (STAT_FLAG_OPERFEAT | STAT_FLAG_CASESENS), FEAT_HIS_STATS_T,
-diff -r 66ed26620ed2 ircd/split.c
+diff -r 2267c134dc0d ircd/split.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/split.c     Mon Jan 26 12:35:59 2009 +0100
++++ b/ircd/split.c     Tue Jan 27 18:25:58 2009 +0100
 @@ -0,0 +1,786 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/split.c