welcome.patch - refreshed for ircu merge

diff --git a/welcome.patch b/welcome.patch
index 606085dce9f15a64af1df479d597a7055c45cda0..54420fe8eea9a52d7c690c673c57133c08bb7e80 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 5169dae4207d include/client.h
---- a/include/client.h Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/client.h Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 include/client.h
+--- a/include/client.h Sun Feb 15 16:04:36 2009 +0100
++++ b/include/client.h Sun Feb 15 16:05:56 2009 +0100
 @@ -149,6 +149,8 @@
      PRIV_GLINE_LOOKUP,   /* staff can use /GLINE to lookup a gline */
      PRIV_HIDE_CHANS,     /* oper can set usermode +n */
@@ -89,9 +89,9 @@ diff -r 5169dae4207d include/client.h
      PRIV_LAST_PRIV /**< number of privileges */
    };
  
-diff -r 5169dae4207d include/handlers.h
---- a/include/handlers.h       Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/handlers.h       Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 include/handlers.h
+--- a/include/handlers.h       Sun Feb 15 16:04:36 2009 +0100
++++ b/include/handlers.h       Sun Feb 15 16:05:56 2009 +0100
 @@ -154,6 +154,7 @@
  extern int m_version(struct Client*, struct Client*, int, char*[]);
  extern int m_wallchops(struct Client*, struct Client*, int, char*[]);
@@ -124,9 +124,9 @@ diff -r 5169dae4207d include/handlers.h
  extern int mh_who(struct Client*, struct Client*, int, char*[]);
  extern int mh_whois(struct Client*, struct Client*, int, char*[]);
  extern int mh_whowas(struct Client*, struct Client*, int, char*[]);
-diff -r 5169dae4207d include/ircd_features.h
---- a/include/ircd_features.h  Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/ircd_features.h  Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 include/ircd_features.h
+--- a/include/ircd_features.h  Sun Feb 15 16:04:36 2009 +0100
++++ b/include/ircd_features.h  Sun Feb 15 16:05:56 2009 +0100
 @@ -101,6 +101,7 @@
    FEAT_IRCD_RES_TIMEOUT,
    FEAT_AUTH_TIMEOUT,
@@ -143,9 +143,9 @@ diff -r 5169dae4207d include/ircd_features.h
    FEAT_HIS_STATS_w,
    FEAT_HIS_STATS_x,
    FEAT_HIS_STATS_y,
-diff -r 5169dae4207d include/msg.h
---- a/include/msg.h    Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/msg.h    Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 include/msg.h
+--- a/include/msg.h    Sun Feb 15 16:04:36 2009 +0100
++++ b/include/msg.h    Sun Feb 15 16:05:56 2009 +0100
 @@ -200,6 +200,10 @@
  #define TOK_NOTICE              "O"
  #define CMD_NOTICE            MSG_NOTICE, TOK_NOTICE
@@ -157,9 +157,9 @@ diff -r 5169dae4207d include/msg.h
  #define MSG_WALLCHOPS           "WALLCHOPS"     /* WC */
  #define TOK_WALLCHOPS           "WC"
  #define CMD_WALLCHOPS         MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r 5169dae4207d include/numeric.h
---- a/include/numeric.h        Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/numeric.h        Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 include/numeric.h
+--- a/include/numeric.h        Sun Feb 15 16:04:36 2009 +0100
++++ b/include/numeric.h        Sun Feb 15 16:05:56 2009 +0100
 @@ -116,6 +116,7 @@
        RPL_STATSGLINE       227           Dalnet 
        RPL_STATSVLINE       227           unreal */
@@ -177,9 +177,9 @@ diff -r 5169dae4207d include/numeric.h
  #define ERR_SILELISTFULL     511        /* Undernet extension */
  /*      ERR_NOTIFYFULL       512           aircd */
  /*    ERR_TOOMANYWATCH     512           Numeric List: Dalnet */
-diff -r 5169dae4207d include/welcome.h
+diff -r 0e1d8ae7ca15 include/welcome.h
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/welcome.h        Wed Feb 04 17:58:05 2009 +0100
++++ b/include/welcome.h        Sun Feb 15 16:05:56 2009 +0100
 @@ -0,0 +1,60 @@
 +#ifndef INCLUDED_welcome_h
 +#define INCLUDED_welcome_h
@@ -241,9 +241,9 @@ diff -r 5169dae4207d include/welcome.h
 +extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
 +
 +#endif /* INCLUDED_welcome_h */
-diff -r 5169dae4207d ircd/Makefile.in
---- a/ircd/Makefile.in Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/Makefile.in Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/Makefile.in
+--- a/ircd/Makefile.in Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/Makefile.in Sun Feb 15 16:05:56 2009 +0100
 @@ -188,6 +188,7 @@
        m_wallops.c \
        m_wallusers.c \
@@ -286,9 +286,9 @@ diff -r 5169dae4207d 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 5169dae4207d ircd/client.c
---- a/ircd/client.c    Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/client.c    Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/client.c
+--- a/ircd/client.c    Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/client.c    Sun Feb 15 16:05:56 2009 +0100
 @@ -184,6 +184,7 @@
      FlagSet(&privs_local, PRIV_WHOX);
      FlagSet(&privs_local, PRIV_DISPLAY);
@@ -297,15 +297,15 @@ diff -r 5169dae4207d ircd/client.c
      FlagClr(&privs_local, PRIV_STAFF);
      FlagClr(&privs_local, PRIV_CLAIM_NICK);
      FlagClr(&privs_local, PRIV_GLINE_LOOKUP);
-@@ -264,6 +265,7 @@
+@@ -247,6 +248,7 @@
      ClrPriv(client, PRIV_OPMODE);
      ClrPriv(client, PRIV_OPKICK);
      ClrPriv(client, PRIV_BADCHAN);
 +    ClrPriv(client, PRIV_WELCOME);
    }
- }
- 
-@@ -289,6 +291,7 @@
+   /* TODO: better way than this? */
+   /* do not let staff have privs they should not have */
+@@ -283,6 +285,7 @@
    P(USER_PRIVACY),
    P(STAFF),          P(CLAIM_NICK),     P(GLINE_LOOKUP),  P(HIDE_CHANS),
    P(CHECK_CHANNEL),
@@ -313,10 +313,10 @@ diff -r 5169dae4207d ircd/client.c
  #undef P
    { 0, 0 }
  };
-diff -r 5169dae4207d ircd/ircd_features.c
---- a/ircd/ircd_features.c     Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/ircd_features.c     Wed Feb 04 17:58:05 2009 +0100
-@@ -355,6 +355,7 @@
+diff -r 0e1d8ae7ca15 ircd/ircd_features.c
+--- a/ircd/ircd_features.c     Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/ircd_features.c     Sun Feb 15 16:05:56 2009 +0100
+@@ -366,6 +366,7 @@
    F_I(IRCD_RES_TIMEOUT, 0, 4, 0),
    F_I(AUTH_TIMEOUT, 0, 9, 0),
    F_B(ANNOUNCE_INVITES, 0, 0, 0),
@@ -324,7 +324,7 @@ diff -r 5169dae4207d ircd/ircd_features.c
  
    /* features that affect all operators */
    F_B(EXTENDED_CHECKCMD, 0, 0, 0),
-@@ -397,6 +398,7 @@
+@@ -408,6 +409,7 @@
    F_B(HIS_STATS_u, 0, 1, 0),
    F_B(HIS_STATS_U, 0, 1, 0),
    F_B(HIS_STATS_v, 0, 1, 0),
@@ -332,9 +332,9 @@ diff -r 5169dae4207d 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 5169dae4207d ircd/ircd_lexer.l
---- a/ircd/ircd_lexer.l        Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/ircd_lexer.l        Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/ircd_lexer.l
+--- a/ircd/ircd_lexer.l        Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/ircd_lexer.l        Sun Feb 15 16:05:56 2009 +0100
 @@ -173,6 +173,8 @@
    { "gline_lookup", TPRIV_GLINE_LOOKUP },
    { "hide_chans", TPRIV_HIDE_CHANS },
@@ -344,9 +344,9 @@ diff -r 5169dae4207d ircd/ircd_lexer.l
    { NULL, 0 }
  };
  static int ntokens;
-diff -r 5169dae4207d ircd/ircd_parser.y
---- a/ircd/ircd_parser.y       Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/ircd_parser.y       Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/ircd_parser.y
+--- a/ircd/ircd_parser.y       Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/ircd_parser.y       Sun Feb 15 16:05:56 2009 +0100
 @@ -192,6 +192,7 @@
  %token TPRIV_CHANNEL_PRIVACY TPRIV_USER_PRIVACY TPRIV_LIST_CHAN
  %token TPRIV_STAFF TPRIV_CLAIM_NICK TPRIV_GLINE_LOOKUP TPRIV_HIDE_CHANS
@@ -355,7 +355,7 @@ diff -r 5169dae4207d ircd/ircd_parser.y
  /* and some types... */
  %type <num> sizespec
  %type <num> timespec timefactor factoredtimes factoredtime
-@@ -713,6 +714,8 @@
+@@ -715,6 +716,8 @@
            TPRIV_GLINE_LOOKUP { $$ = PRIV_GLINE_LOOKUP; } |
            TPRIV_CHECK_CHANNEL { $$ = PRIV_CHECK_CHANNEL; } |
            TPRIV_HIDE_CHANS { $$ = PRIV_HIDE_CHANS; } |
@@ -364,9 +364,9 @@ diff -r 5169dae4207d ircd/ircd_parser.y
            TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
  yesorno: YES { $$ = 1; } | NO { $$ = 0; };
  
-diff -r 5169dae4207d ircd/m_welcome.c
+diff -r 0e1d8ae7ca15 ircd/m_welcome.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_welcome.c Wed Feb 04 17:58:05 2009 +0100
++++ b/ircd/m_welcome.c Sun Feb 15 16:05:56 2009 +0100
 @@ -0,0 +1,308 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/m_welcome.c
@@ -676,9 +676,9 @@ diff -r 5169dae4207d ircd/m_welcome.c
 +  }
 +  return 0;
 +}
-diff -r 5169dae4207d ircd/parse.c
---- a/ircd/parse.c     Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/parse.c     Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/parse.c
+--- a/ircd/parse.c     Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/parse.c     Sun Feb 15 16:05:56 2009 +0100
 @@ -674,6 +674,15 @@
      /* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
      { m_unregistered, m_not_oper, ms_opkick, mo_opkick, m_ignore, mh_nohelp }
@@ -695,9 +695,9 @@ diff -r 5169dae4207d 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 5169dae4207d ircd/s_err.c
---- a/ircd/s_err.c     Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/s_err.c     Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/s_err.c
+--- a/ircd/s_err.c     Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/s_err.c     Sun Feb 15 16:05:56 2009 +0100
 @@ -486,7 +486,7 @@
  /* 226 */
    { RPL_STATSALINE, "%s", "226" },
@@ -716,9 +716,9 @@ diff -r 5169dae4207d ircd/s_err.c
  /* 510 */
    { 0 },
  /* 511 */
-diff -r 5169dae4207d ircd/s_serv.c
---- a/ircd/s_serv.c    Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/s_serv.c    Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/s_serv.c
+--- a/ircd/s_serv.c    Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/s_serv.c    Sun Feb 15 16:05:56 2009 +0100
 @@ -57,6 +57,7 @@
  #include "struct.h"
  #include "sys.h"
@@ -735,9 +735,9 @@ diff -r 5169dae4207d ircd/s_serv.c
  
    /*
     * Pass on my client information to the new server
-diff -r 5169dae4207d ircd/s_stats.c
---- a/ircd/s_stats.c   Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/s_stats.c   Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/s_stats.c
+--- a/ircd/s_stats.c   Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/s_stats.c   Sun Feb 15 16:05:56 2009 +0100
 @@ -54,6 +54,7 @@
  #include "send.h"
  #include "struct.h"
@@ -746,7 +746,7 @@ diff -r 5169dae4207d ircd/s_stats.c
  
  #include <stdio.h>
  #include <stdlib.h>
-@@ -689,9 +690,12 @@
+@@ -691,9 +692,12 @@
    { 'V', "vserversmach", (STAT_FLAG_OPERFEAT | STAT_FLAG_VARPARAM | STAT_FLAG_CASESENS), FEAT_HIS_STATS_v,
      stats_servers_verbose, 0,
      "Verbose server information." },
@@ -760,9 +760,9 @@ diff -r 5169dae4207d ircd/s_stats.c
    { 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
      stats_meminfo, 0,
      "List usage information." },
-diff -r 5169dae4207d ircd/s_user.c
---- a/ircd/s_user.c    Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/s_user.c    Wed Feb 04 17:58:05 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/s_user.c
+--- a/ircd/s_user.c    Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/s_user.c    Sun Feb 15 16:05:56 2009 +0100
 @@ -63,6 +63,7 @@
  #include "userload.h"
  #include "version.h"
@@ -781,9 +781,9 @@ diff -r 5169dae4207d ircd/s_user.c
    }
    else {
      struct Client *acptr = user->server;
-diff -r 5169dae4207d ircd/welcome.c
+diff -r 0e1d8ae7ca15 ircd/welcome.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/welcome.c   Wed Feb 04 17:58:05 2009 +0100
++++ b/ircd/welcome.c   Sun Feb 15 16:05:56 2009 +0100
 @@ -0,0 +1,373 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/welcome.c