split.patch placed a server = parv[1]; in the wrong place causing a core upon parsing...

[irc/quakenet/snircd-patchqueue.git] / split.patch

diff --git a/split.patch b/split.patch
index 2975115950bacdb8a0693644a68bc0e756fdf14a..ca209723501167d18ca45898fe5743bacbe0398c 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 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
+diff -r 3ab25cd90c2e doc/api/log.txt
+--- a/doc/api/log.txt  Tue Jan 27 20:50:02 2009 +0100
++++ b/doc/api/log.txt  Tue Jan 27 21:14:37 2009 +0100
 @@ -41,7 +41,7 @@
  
  <enum>
@@ -19,9 +19,9 @@ diff -r 2267c134dc0d 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 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
+diff -r 3ab25cd90c2e include/handlers.h
+--- a/include/handlers.h       Tue Jan 27 20:50:02 2009 +0100
++++ b/include/handlers.h       Tue Jan 27 21:14:37 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*[]);
@@ -46,9 +46,9 @@ diff -r 2267c134dc0d 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 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
+diff -r 3ab25cd90c2e include/ircd_features.h
+--- a/include/ircd_features.h  Tue Jan 27 20:50:02 2009 +0100
++++ b/include/ircd_features.h  Tue Jan 27 21:14:37 2009 +0100
 @@ -112,6 +112,10 @@
    FEAT_SETHOST_USER,
    FEAT_SETHOST_AUTO,
@@ -68,9 +68,9 @@ diff -r 2267c134dc0d include/ircd_features.h
    FEAT_HIS_STATS_s,
    FEAT_HIS_STATS_t,
    FEAT_HIS_STATS_T,
-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
+diff -r 3ab25cd90c2e include/ircd_log.h
+--- a/include/ircd_log.h       Tue Jan 27 20:50:02 2009 +0100
++++ b/include/ircd_log.h       Tue Jan 27 21:14:37 2009 +0100
 @@ -55,6 +55,7 @@
    LS_OPERMODE,   /**< Uses of OPMODE, CLEARMODE< etc. */
    LS_GLINE,      /**< Adding, (de-)activating or removing GLINEs. */
@@ -79,9 +79,9 @@ diff -r 2267c134dc0d include/ircd_log.h
    LS_WHO,        /**< Use of extended WHO privileges. */
    LS_NETWORK,    /**< New server connections. */
    LS_OPERKILL,   /**< Kills by IRC operators. */
-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
+diff -r 3ab25cd90c2e include/msg.h
+--- a/include/msg.h    Tue Jan 27 20:50:02 2009 +0100
++++ b/include/msg.h    Tue Jan 27 21:14:37 2009 +0100
 @@ -336,6 +336,10 @@
  #define TOK_JUPE                "JU"
  #define CMD_JUPE              MSG_JUPE, TOK_JUPE
@@ -93,9 +93,9 @@ diff -r 2267c134dc0d include/msg.h
  #define MSG_OPMODE              "OPMODE"        /* OPMO */
  #define TOK_OPMODE              "OM"
  #define CMD_OPMODE            MSG_OPMODE, TOK_OPMODE
-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
+diff -r 3ab25cd90c2e include/numeric.h
+--- a/include/numeric.h        Tue Jan 27 20:50:02 2009 +0100
++++ b/include/numeric.h        Tue Jan 27 21:14:37 2009 +0100
 @@ -118,6 +118,7 @@
  #define RPL_STATSALINE       226        /* Hybrid, Undernet */
  #define RPL_STATSWELCOME     227        /* QuakeNet extension */
@@ -113,7 +113,7 @@ diff -r 2267c134dc0d include/numeric.h
  #define RPL_GLIST            280        /* Undernet extension */
  #define RPL_ENDOFGLIST       281        /* Undernet extension */
  #define RPL_JUPELIST         282        /* Undernet extension - jupe -Kev */
-@@ -445,6 +448,7 @@
+@@ -449,6 +452,7 @@
  
  #define ERR_NOSUCHWELCOME    509        /* QuakeNet extension */
  
@@ -121,9 +121,9 @@ diff -r 2267c134dc0d include/numeric.h
  #define ERR_SILELISTFULL     511        /* Undernet extension */
  /*      ERR_NOTIFYFULL       512           aircd */
  /*    ERR_TOOMANYWATCH     512           Numeric List: Dalnet */
-diff -r 2267c134dc0d include/split.h
+diff -r 3ab25cd90c2e include/split.h
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/split.h  Tue Jan 27 18:25:58 2009 +0100
++++ b/include/split.h  Tue Jan 27 21:14:37 2009 +0100
 @@ -0,0 +1,106 @@
 +#ifndef INCLUDED_split_h
 +#define INCLUDED_split_h
@@ -231,9 +231,9 @@ diff -r 2267c134dc0d include/split.h
 +extern int split_memory_count(size_t *sp_size);
 +
 +#endif /* INCLUDED_split_h */
-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
+diff -r 3ab25cd90c2e ircd/Makefile.in
+--- a/ircd/Makefile.in Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/Makefile.in Tue Jan 27 21:14:37 2009 +0100
 @@ -173,6 +173,7 @@
        m_sethost.c \
        m_settime.c \
@@ -291,9 +291,9 @@ diff -r 2267c134dc0d 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 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
+diff -r 3ab25cd90c2e ircd/ircd.c
+--- a/ircd/ircd.c      Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/ircd.c      Tue Jan 27 21:14:37 2009 +0100
 @@ -55,6 +55,7 @@
  #include "s_misc.h"
  #include "s_stats.h"
@@ -312,9 +312,9 @@ diff -r 2267c134dc0d ircd/ircd.c
    event_loop();
  
    return 0;
-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
+diff -r 3ab25cd90c2e ircd/ircd_features.c
+--- a/ircd/ircd_features.c     Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/ircd_features.c     Tue Jan 27 21:14:37 2009 +0100
 @@ -366,6 +366,10 @@
    F_B(SETHOST_USER, 0, 0, 0),
    F_B(SETHOST_AUTO, 0, 0, 0),
@@ -334,9 +334,9 @@ diff -r 2267c134dc0d 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 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
+diff -r 3ab25cd90c2e ircd/ircd_log.c
+--- a/ircd/ircd_log.c  Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/ircd_log.c  Tue Jan 27 21:14:37 2009 +0100
 @@ -154,6 +154,7 @@
    S(OPERMODE, -1, SNO_HACK4),
    S(GLINE, -1, SNO_GLINE),
@@ -345,9 +345,9 @@ diff -r 2267c134dc0d ircd/ircd_log.c
    S(WHO, -1, 0),
    S(NETWORK, -1, SNO_NETWORK),
    S(OPERKILL, -1, 0),
-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
+diff -r 3ab25cd90c2e ircd/m_endburst.c
+--- a/ircd/m_endburst.c        Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/m_endburst.c        Tue Jan 27 21:14:37 2009 +0100
 @@ -85,6 +85,7 @@
  #include "client.h"
  #include "hash.h"
@@ -383,9 +383,9 @@ diff -r 2267c134dc0d ircd/m_endburst.c
    if (MyConnect(sptr))
      sendcmdto_one(&me, CMD_END_OF_BURST_ACK, sptr, "");
  
-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
+diff -r 3ab25cd90c2e ircd/m_reburst.c
+--- a/ircd/m_reburst.c Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/m_reburst.c Tue Jan 27 21:14:37 2009 +0100
 @@ -102,6 +102,7 @@
  #include "ircd_snprintf.h"
  #include "gline.h"
@@ -405,9 +405,9 @@ diff -r 2267c134dc0d ircd/m_reburst.c
      default:
        break;
    }
-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
+diff -r 3ab25cd90c2e ircd/m_server.c
+--- a/ircd/m_server.c  Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/m_server.c  Tue Jan 27 21:14:37 2009 +0100
 @@ -47,6 +47,7 @@
  #include "s_misc.h"
  #include "s_serv.h"
@@ -426,10 +426,10 @@ diff -r 2267c134dc0d 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 2267c134dc0d ircd/m_split.c
+diff -r 3ab25cd90c2e ircd/m_split.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_split.c   Tue Jan 27 18:25:58 2009 +0100
-@@ -0,0 +1,376 @@
++++ b/ircd/m_split.c   Tue Jan 27 21:14:37 2009 +0100
+@@ -0,0 +1,378 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/m_split.c
 + * Copyright (C) 1990 Jarkko Oikarinen and
@@ -554,13 +554,16 @@ diff -r 2267c134dc0d ircd/m_split.c
 +  unsigned int flags = 0;
 +  enum SplitAction action = SPLIT_MODIFY;
 +  time_t creation = 0, expire = 0, lastmod = 0, lifetime = 0;
-+  char *server = 0, *tmp = 0;
++  char *server;
 +  const char *reason = "No reason";
 +
 +  /* reason is optional - for lazy services, we always send it */
 +  if (parc < 5)
 +    return need_more_params(sptr, "SPLIT");
 +
++  /* server param */
++  server = parv[1];
++
 +  if (*server == '!') {
 +    server++;
 +    action = SPLIT_REMOVE; /* removing entry */
@@ -581,7 +584,6 @@ diff -r 2267c134dc0d ircd/m_split.c
 +  }
 +
 +  /* Next, try to find the split entry... */
-+  server = parv[1];
 +  asplit = split_find(server);
 +
 +  /* We now have all the pieces to tell us what we've got; let's put
@@ -806,9 +808,9 @@ diff -r 2267c134dc0d ircd/m_split.c
 +
 +  return split_list(sptr, parv[1]);
 +}
-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
+diff -r 3ab25cd90c2e ircd/parse.c
+--- a/ircd/parse.c     Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/parse.c     Tue Jan 27 21:14:37 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 +825,9 @@ diff -r 2267c134dc0d ircd/parse.c
    {
      MSG_OPMODE,
      TOK_OPMODE,
-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
+diff -r 3ab25cd90c2e ircd/s_conf.c
+--- a/ircd/s_conf.c    Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/s_conf.c    Tue Jan 27 21:14:37 2009 +0100
 @@ -53,6 +53,7 @@
  #include "s_debug.h"
  #include "s_misc.h"
@@ -842,9 +844,9 @@ diff -r 2267c134dc0d ircd/s_conf.c
  
    return ret;
  }
-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
+diff -r 3ab25cd90c2e ircd/s_debug.c
+--- a/ircd/s_debug.c   Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/s_debug.c   Tue Jan 27 21:14:37 2009 +0100
 @@ -48,6 +48,7 @@
  #include "s_user.h"
  #include "s_stats.h"
@@ -883,9 +885,9 @@ diff -r 2267c134dc0d ircd/s_debug.c
  
    send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
             ":Hash: client %d(%zu), chan is the same", HASHSIZE,
-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
+diff -r 3ab25cd90c2e ircd/s_err.c
+--- a/ircd/s_err.c     Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/s_err.c     Tue Jan 27 21:14:37 2009 +0100
 @@ -490,7 +490,7 @@
  /* 228 */
    { RPL_STATSQLINE, "Q %s :%s", "228" },
@@ -916,9 +918,9 @@ diff -r 2267c134dc0d ircd/s_err.c
  /* 511 */
    { ERR_SILELISTFULL, "%s :Your silence list is full", "511" },
  /* 512 */
-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
+diff -r 3ab25cd90c2e ircd/s_misc.c
+--- a/ircd/s_misc.c    Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/s_misc.c    Tue Jan 27 21:14:37 2009 +0100
 @@ -53,6 +53,7 @@
  #include "s_stats.h"
  #include "s_user.h"
@@ -951,9 +953,9 @@ diff -r 2267c134dc0d ircd/s_misc.c
    }
  
    /*
-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
+diff -r 3ab25cd90c2e ircd/s_serv.c
+--- a/ircd/s_serv.c    Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/s_serv.c    Tue Jan 27 21:14:37 2009 +0100
 @@ -54,6 +54,7 @@
  #include "s_misc.h"
  #include "s_user.h"
@@ -970,9 +972,9 @@ diff -r 2267c134dc0d ircd/s_serv.c
    welcome_burst(cptr);
  
    /*
-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
+diff -r 3ab25cd90c2e ircd/s_stats.c
+--- a/ircd/s_stats.c   Tue Jan 27 20:50:02 2009 +0100
++++ b/ircd/s_stats.c   Tue Jan 27 21:14:37 2009 +0100
 @@ -52,6 +52,7 @@
  #include "s_stats.h"
  #include "s_user.h"
@@ -993,9 +995,9 @@ diff -r 2267c134dc0d ircd/s_stats.c
      stats_sline, 0,
      "Spoofed hosts information." },
    { 'T', "motds", (STAT_FLAG_OPERFEAT | STAT_FLAG_CASESENS), FEAT_HIS_STATS_T,
-diff -r 2267c134dc0d ircd/split.c
+diff -r 3ab25cd90c2e ircd/split.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/split.c     Tue Jan 27 18:25:58 2009 +0100
++++ b/ircd/split.c     Tue Jan 27 21:14:37 2009 +0100
 @@ -0,0 +1,786 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/split.c