welcome: refresh for changes by checkmscheck to parse.c

diff --git a/welcome.patch b/welcome.patch
index c4d6603dc8a4c3aa3c6b3fbb61b6a02049647956..e1bafc39ffe7b2b7f50bc1665a4cd528a46893b6 100644 (file)
--- a/welcome.patch
+++ b/welcome.patch
@@ -77,9 +77,9 @@ ircd/ircd_lexer.l
 ircd/ircd_parser.y
 add PRIV_LOCAL_WELCOME PRIV_WELCOME
 
-diff -r a8dd2ab5026c include/client.h
---- a/include/client.h Wed Mar 17 15:45:26 2010 +0100
-+++ b/include/client.h Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e include/client.h
+--- a/include/client.h Tue Mar 23 20:10:46 2010 +0100
++++ b/include/client.h Tue Mar 23 20:11:20 2010 +0100
 @@ -142,6 +142,8 @@
      PRIV_USER_PRIVACY,  /* oper can bypass user privacy +x etc gives i.e. see real ip's */
      PRIV_CHANNEL_PRIVACY, /* oper can bypass channel privacy i.e. can see modes on channels they are not on and channel keys */ 
@@ -89,10 +89,10 @@ diff -r a8dd2ab5026c include/client.h
      PRIV_LAST_PRIV /**< number of privileges */
    };
  
-diff -r a8dd2ab5026c include/handlers.h
---- a/include/handlers.h       Wed Mar 17 15:45:26 2010 +0100
-+++ b/include/handlers.h       Wed Mar 17 17:00:27 2010 +0100
-@@ -151,6 +151,7 @@
+diff -r 47d03ce52e8e include/handlers.h
+--- a/include/handlers.h       Tue Mar 23 20:10:46 2010 +0100
++++ b/include/handlers.h       Tue Mar 23 20:11:20 2010 +0100
+@@ -138,6 +138,7 @@
  extern int m_version(struct Client*, struct Client*, int, char*[]);
  extern int m_wallchops(struct Client*, struct Client*, int, char*[]);
  extern int m_wallvoices(struct Client*, struct Client*, int, char*[]);
@@ -100,7 +100,7 @@ diff -r a8dd2ab5026c include/handlers.h
  extern int m_who(struct Client*, struct Client*, int, char*[]);
  extern int m_whois(struct Client*, struct Client*, int, char*[]);
  extern int m_whowas(struct Client*, struct Client*, int, char*[]);
-@@ -184,6 +185,7 @@
+@@ -172,6 +173,7 @@
  extern int mo_version(struct Client*, struct Client*, int, char*[]);
  extern int mo_wallops(struct Client*, struct Client*, int, char*[]);
  extern int mo_wallusers(struct Client*, struct Client*, int, char*[]);
@@ -108,7 +108,7 @@ diff -r a8dd2ab5026c include/handlers.h
  extern int mo_xquery(struct Client*, struct Client*, int, char*[]);
  extern int mr_error(struct Client*, struct Client*, int, char*[]);
  extern int mr_error(struct Client*, struct Client*, int, char*[]);
-@@ -241,6 +243,7 @@
+@@ -230,6 +232,7 @@
  extern int ms_wallops(struct Client*, struct Client*, int, char*[]);
  extern int ms_wallusers(struct Client*, struct Client*, int, char*[]);
  extern int ms_wallvoices(struct Client*, struct Client*, int, char*[]);
@@ -116,9 +116,9 @@ diff -r a8dd2ab5026c include/handlers.h
  extern int ms_whois(struct Client*, struct Client*, int, char*[]);
  extern int ms_xquery(struct Client*, struct Client*, int, char*[]);
  extern int ms_xreply(struct Client*, struct Client*, int, char*[]);
-diff -r a8dd2ab5026c include/ircd_features.h
---- a/include/ircd_features.h  Wed Mar 17 15:45:26 2010 +0100
-+++ b/include/ircd_features.h  Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e include/ircd_features.h
+--- a/include/ircd_features.h  Tue Mar 23 20:10:46 2010 +0100
++++ b/include/ircd_features.h  Tue Mar 23 20:11:20 2010 +0100
 @@ -101,6 +101,7 @@
    FEAT_IRCD_RES_TIMEOUT,
    FEAT_AUTH_TIMEOUT,
@@ -135,9 +135,9 @@ diff -r a8dd2ab5026c include/ircd_features.h
    FEAT_HIS_STATS_w,
    FEAT_HIS_STATS_x,
    FEAT_HIS_STATS_y,
-diff -r a8dd2ab5026c include/msg.h
---- a/include/msg.h    Wed Mar 17 15:45:26 2010 +0100
-+++ b/include/msg.h    Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e include/msg.h
+--- a/include/msg.h    Tue Mar 23 20:10:46 2010 +0100
++++ b/include/msg.h    Tue Mar 23 20:11:20 2010 +0100
 @@ -196,6 +196,10 @@
  #define TOK_NOTICE              "O"
  #define CMD_NOTICE            MSG_NOTICE, TOK_NOTICE
@@ -149,9 +149,9 @@ diff -r a8dd2ab5026c include/msg.h
  #define MSG_WALLCHOPS           "WALLCHOPS"     /* WC */
  #define TOK_WALLCHOPS           "WC"
  #define CMD_WALLCHOPS         MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r a8dd2ab5026c include/numeric.h
---- a/include/numeric.h        Wed Mar 17 15:45:26 2010 +0100
-+++ b/include/numeric.h        Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e include/numeric.h
+--- a/include/numeric.h        Tue Mar 23 20:10:46 2010 +0100
++++ b/include/numeric.h        Tue Mar 23 20:11:20 2010 +0100
 @@ -116,6 +116,7 @@
        RPL_STATSGLINE       227           Dalnet 
        RPL_STATSVLINE       227           unreal */
@@ -169,9 +169,9 @@ diff -r a8dd2ab5026c include/numeric.h
  #define ERR_SILELISTFULL     511        /* Undernet extension */
  /*      ERR_NOTIFYFULL       512           aircd */
  /*    ERR_TOOMANYWATCH     512           Numeric List: Dalnet */
-diff -r a8dd2ab5026c include/welcome.h
+diff -r 47d03ce52e8e include/welcome.h
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/welcome.h        Wed Mar 17 17:00:27 2010 +0100
++++ b/include/welcome.h        Tue Mar 23 20:11:20 2010 +0100
 @@ -0,0 +1,60 @@
 +#ifndef INCLUDED_welcome_h
 +#define INCLUDED_welcome_h
@@ -233,9 +233,9 @@ diff -r a8dd2ab5026c include/welcome.h
 +extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
 +
 +#endif /* INCLUDED_welcome_h */
-diff -r a8dd2ab5026c ircd/Makefile.in
---- a/ircd/Makefile.in Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/Makefile.in Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e ircd/Makefile.in
+--- a/ircd/Makefile.in Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/Makefile.in Tue Mar 23 20:11:20 2010 +0100
 @@ -186,6 +186,7 @@
        m_wallops.c \
        m_wallusers.c \
@@ -278,9 +278,9 @@ diff -r a8dd2ab5026c ircd/Makefile.in
  whocmds.o: whocmds.c ../config.h ../include/whocmds.h \
    ../include/channel.h ../include/ircd_defs.h ../include/res.h \
    ../config.h ../include/client.h ../include/dbuf.h ../include/msgq.h \
-diff -r a8dd2ab5026c ircd/client.c
---- a/ircd/client.c    Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/client.c    Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e ircd/client.c
+--- a/ircd/client.c    Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/client.c    Tue Mar 23 20:11:20 2010 +0100
 @@ -177,6 +177,7 @@
      FlagSet(&privs_local, PRIV_WHOX);
      FlagSet(&privs_local, PRIV_DISPLAY);
@@ -306,9 +306,9 @@ diff -r a8dd2ab5026c ircd/client.c
  #undef P
    { 0, 0 }
  };
-diff -r a8dd2ab5026c ircd/ircd_features.c
---- a/ircd/ircd_features.c     Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/ircd_features.c     Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e ircd/ircd_features.c
+--- a/ircd/ircd_features.c     Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/ircd_features.c     Tue Mar 23 20:11:20 2010 +0100
 @@ -366,6 +366,7 @@
    F_I(IRCD_RES_TIMEOUT, 0, 4, 0),
    F_I(AUTH_TIMEOUT, 0, 9, 0),
@@ -325,9 +325,9 @@ diff -r a8dd2ab5026c ircd/ircd_features.c
    F_B(HIS_STATS_w, 0, 1, 0),
    F_B(HIS_STATS_x, 0, 1, 0),
    F_B(HIS_STATS_y, 0, 1, 0),
-diff -r a8dd2ab5026c ircd/ircd_lexer.l
---- a/ircd/ircd_lexer.l        Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/ircd_lexer.l        Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e ircd/ircd_lexer.l
+--- a/ircd/ircd_lexer.l        Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/ircd_lexer.l        Tue Mar 23 20:11:20 2010 +0100
 @@ -166,6 +166,8 @@
    { "serverinfo", TPRIV_SERVERINFO },
    { "user_privacy", TPRIV_USER_PRIVACY },
@@ -337,9 +337,9 @@ diff -r a8dd2ab5026c ircd/ircd_lexer.l
    { NULL, 0 }
  };
  static int ntokens;
-diff -r a8dd2ab5026c ircd/ircd_parser.y
---- a/ircd/ircd_parser.y       Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/ircd_parser.y       Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e ircd/ircd_parser.y
+--- a/ircd/ircd_parser.y       Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/ircd_parser.y       Tue Mar 23 20:11:20 2010 +0100
 @@ -189,6 +189,7 @@
  %token TPRIV_CHANSERV TPRIV_XTRA_OPER TPRIV_NOIDLE TPRIV_FREEFORM TPRIV_PARANOID
  %token TPRIV_CHECK TPRIV_WALL TPRIV_CLOSE TPRIV_ROUTE TPRIV_ROUTEINFO TPRIV_SERVERINFO
@@ -357,9 +357,9 @@ diff -r a8dd2ab5026c ircd/ircd_parser.y
            TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
  yesorno: YES { $$ = 1; } | NO { $$ = 0; };
  
-diff -r a8dd2ab5026c ircd/m_welcome.c
+diff -r 47d03ce52e8e ircd/m_welcome.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_welcome.c Wed Mar 17 17:00:27 2010 +0100
++++ b/ircd/m_welcome.c Tue Mar 23 20:11:20 2010 +0100
 @@ -0,0 +1,288 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/m_welcome.c
@@ -649,12 +649,12 @@ diff -r a8dd2ab5026c ircd/m_welcome.c
 +  /* and do it */
 +  return welcome_do(cptr, sptr, name, text, who, timestamp, flags);
 +}
-diff -r a8dd2ab5026c ircd/parse.c
---- a/ircd/parse.c     Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/parse.c     Wed Mar 17 17:00:27 2010 +0100
-@@ -670,6 +670,15 @@
-     0, MAXPARA, MFLG_SLOW, 0, NULL,
-     { m_unregistered, m_not_oper, m_check, m_check, m_ignore }
+diff -r 47d03ce52e8e ircd/parse.c
+--- a/ircd/parse.c     Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/parse.c     Tue Mar 23 20:11:20 2010 +0100
+@@ -661,6 +661,15 @@
+     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+     { m_unregistered, m_not_oper, ms_check, mo_check, m_ignore }
    },
 +  
 +  /* add command for WELCOME */
@@ -668,9 +668,9 @@ diff -r a8dd2ab5026c ircd/parse.c
  
    /* This command is an alias for QUIT during the unregistered part of
     * of the server.  This is because someone jumping via a broken web
-diff -r a8dd2ab5026c ircd/s_err.c
---- a/ircd/s_err.c     Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/s_err.c     Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e ircd/s_err.c
+--- a/ircd/s_err.c     Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/s_err.c     Tue Mar 23 20:11:20 2010 +0100
 @@ -486,7 +486,7 @@
  /* 226 */
    { RPL_STATSALINE, "%s", "226" },
@@ -689,9 +689,9 @@ diff -r a8dd2ab5026c ircd/s_err.c
  /* 510 */
    { 0 },
  /* 511 */
-diff -r a8dd2ab5026c ircd/s_serv.c
---- a/ircd/s_serv.c    Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/s_serv.c    Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e ircd/s_serv.c
+--- a/ircd/s_serv.c    Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/s_serv.c    Tue Mar 23 20:11:20 2010 +0100
 @@ -57,6 +57,7 @@
  #include "struct.h"
  #include "sys.h"
@@ -708,9 +708,9 @@ diff -r a8dd2ab5026c ircd/s_serv.c
  
    /*
     * Pass on my client information to the new server
-diff -r a8dd2ab5026c ircd/s_stats.c
---- a/ircd/s_stats.c   Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/s_stats.c   Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e ircd/s_stats.c
+--- a/ircd/s_stats.c   Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/s_stats.c   Tue Mar 23 20:11:20 2010 +0100
 @@ -54,6 +54,7 @@
  #include "send.h"
  #include "struct.h"
@@ -733,9 +733,9 @@ diff -r a8dd2ab5026c ircd/s_stats.c
    { 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
      stats_meminfo, 0,
      "List usage information." },
-diff -r a8dd2ab5026c ircd/s_user.c
---- a/ircd/s_user.c    Wed Mar 17 15:45:26 2010 +0100
-+++ b/ircd/s_user.c    Wed Mar 17 17:00:27 2010 +0100
+diff -r 47d03ce52e8e ircd/s_user.c
+--- a/ircd/s_user.c    Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/s_user.c    Tue Mar 23 20:11:20 2010 +0100
 @@ -63,6 +63,7 @@
  #include "userload.h"
  #include "version.h"
@@ -744,7 +744,7 @@ diff -r a8dd2ab5026c ircd/s_user.c
  
  #include "handlers.h" /* m_motd and m_lusers */
  
-@@ -411,6 +412,9 @@
+@@ -410,6 +411,9 @@
                             cli_info(sptr), NumNick(cptr) /* two %s's */);
  
      IPcheck_connect_succeeded(sptr);
@@ -754,9 +754,9 @@ diff -r a8dd2ab5026c ircd/s_user.c
    }
    else {
      struct Client *acptr = user->server;
-diff -r a8dd2ab5026c ircd/welcome.c
+diff -r 47d03ce52e8e ircd/welcome.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/welcome.c   Wed Mar 17 17:00:27 2010 +0100
++++ b/ircd/welcome.c   Tue Mar 23 20:11:20 2010 +0100
 @@ -0,0 +1,369 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/welcome.c