welcome.patch - fixed conflicts with staffpriv.patch

diff --git a/welcome.patch b/welcome.patch
index 50445f1b21408b064e4c8a3eba4d0c2c6b9ba7b2..606085dce9f15a64af1df479d597a7055c45cda0 100644 (file)
--- a/welcome.patch
+++ b/welcome.patch
@@ -77,22 +77,22 @@ ircd/ircd_lexer.l
 ircd/ircd_parser.y
 add PRIV_LOCAL_WELCOME PRIV_WELCOME
 
-diff -r ed93c5ec7a2b include/client.h
---- a/include/client.h Tue Feb 03 18:41:29 2009 +0100
-+++ b/include/client.h Tue Feb 03 19:05:37 2009 +0100
-@@ -144,6 +144,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 */ 
-     PRIV_SERVERINFO,     /* oper can use /get, /stats, /hash, retrieve remote information */
+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
+@@ -149,6 +149,8 @@
+     PRIV_GLINE_LOOKUP,   /* staff can use /GLINE to lookup a gline */
+     PRIV_HIDE_CHANS,     /* oper can set usermode +n */
+     PRIV_CHECK_CHANNEL,  /* staff can /CHECK #channel */
 +    PRIV_WELCOME,        /* oper can WELCOME */
 +    PRIV_LOCAL_WELCOME,  /* oper can local WELCOME */
      PRIV_LAST_PRIV /**< number of privileges */
    };
  
-diff -r ed93c5ec7a2b include/handlers.h
---- a/include/handlers.h       Tue Feb 03 18:41:29 2009 +0100
-+++ b/include/handlers.h       Tue Feb 03 19:05:37 2009 +0100
-@@ -151,6 +151,7 @@
+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
+@@ -154,6 +154,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 ed93c5ec7a2b 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*[]);
-@@ -185,6 +186,7 @@
+@@ -189,6 +190,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 ed93c5ec7a2b include/handlers.h
  extern int mr_error(struct Client*, struct Client*, int, char*[]);
  extern int mr_error(struct Client*, struct Client*, int, char*[]);
  extern int mr_pong(struct Client*, struct Client*, int, char*[]);
-@@ -242,6 +244,7 @@
+@@ -247,6 +249,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,7 +116,7 @@ diff -r ed93c5ec7a2b include/handlers.h
  extern int ms_whois(struct Client*, struct Client*, int, char*[]);
  
  extern int mh_nohelp(struct Client*, struct Client*, int, char*[]);
-@@ -308,6 +311,7 @@
+@@ -313,6 +316,7 @@
  extern int mh_wallops(struct Client*, struct Client*, int, char*[]);
  extern int mh_wallusers(struct Client*, struct Client*, int, char*[]);
  extern int mh_wallvoices(struct Client*, struct Client*, int, char*[]);
@@ -124,9 +124,9 @@ diff -r ed93c5ec7a2b 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 ed93c5ec7a2b include/ircd_features.h
---- a/include/ircd_features.h  Tue Feb 03 18:41:29 2009 +0100
-+++ b/include/ircd_features.h  Tue Feb 03 19:05:37 2009 +0100
+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
 @@ -101,6 +101,7 @@
    FEAT_IRCD_RES_TIMEOUT,
    FEAT_AUTH_TIMEOUT,
@@ -143,10 +143,10 @@ diff -r ed93c5ec7a2b include/ircd_features.h
    FEAT_HIS_STATS_w,
    FEAT_HIS_STATS_x,
    FEAT_HIS_STATS_y,
-diff -r ed93c5ec7a2b include/msg.h
---- a/include/msg.h    Tue Feb 03 18:41:29 2009 +0100
-+++ b/include/msg.h    Tue Feb 03 19:05:37 2009 +0100
-@@ -196,6 +196,10 @@
+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
+@@ -200,6 +200,10 @@
  #define TOK_NOTICE              "O"
  #define CMD_NOTICE            MSG_NOTICE, TOK_NOTICE
  
@@ -157,9 +157,9 @@ diff -r ed93c5ec7a2b include/msg.h
  #define MSG_WALLCHOPS           "WALLCHOPS"     /* WC */
  #define TOK_WALLCHOPS           "WC"
  #define CMD_WALLCHOPS         MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r ed93c5ec7a2b include/numeric.h
---- a/include/numeric.h        Tue Feb 03 18:41:29 2009 +0100
-+++ b/include/numeric.h        Tue Feb 03 19:05:37 2009 +0100
+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
 @@ -116,6 +116,7 @@
        RPL_STATSGLINE       227           Dalnet 
        RPL_STATSVLINE       227           unreal */
@@ -177,9 +177,9 @@ diff -r ed93c5ec7a2b include/numeric.h
  #define ERR_SILELISTFULL     511        /* Undernet extension */
  /*      ERR_NOTIFYFULL       512           aircd */
  /*    ERR_TOOMANYWATCH     512           Numeric List: Dalnet */
-diff -r ed93c5ec7a2b include/welcome.h
+diff -r 5169dae4207d include/welcome.h
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/welcome.h        Tue Feb 03 19:05:37 2009 +0100
++++ b/include/welcome.h        Wed Feb 04 17:58:05 2009 +0100
 @@ -0,0 +1,60 @@
 +#ifndef INCLUDED_welcome_h
 +#define INCLUDED_welcome_h
@@ -241,10 +241,10 @@ diff -r ed93c5ec7a2b include/welcome.h
 +extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
 +
 +#endif /* INCLUDED_welcome_h */
-diff -r ed93c5ec7a2b ircd/Makefile.in
---- a/ircd/Makefile.in Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/Makefile.in Tue Feb 03 19:05:37 2009 +0100
-@@ -187,6 +187,7 @@
+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
+@@ -188,6 +188,7 @@
        m_wallops.c \
        m_wallusers.c \
        m_wallvoices.c \
@@ -252,7 +252,7 @@ diff -r ed93c5ec7a2b ircd/Makefile.in
        m_who.c \
        m_whois.c \
        m_whowas.c \
-@@ -214,6 +215,7 @@
+@@ -215,6 +216,7 @@
        send.c \
        uping.c \
        userload.c \
@@ -260,7 +260,7 @@ diff -r ed93c5ec7a2b ircd/Makefile.in
        whocmds.c \
        whowas.c \
        y.tab.c
-@@ -1168,6 +1170,11 @@
+@@ -1180,6 +1182,11 @@
    ../include/ircd_reply.h ../include/ircd_string.h \
    ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
    ../include/numnicks.h ../include/s_user.h ../include/send.h
@@ -272,7 +272,7 @@ diff -r ed93c5ec7a2b ircd/Makefile.in
  m_who.o: m_who.c ../config.h ../include/channel.h ../include/ircd_defs.h \
    ../include/res.h ../config.h ../include/client.h ../include/dbuf.h \
    ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
-@@ -1429,6 +1436,13 @@
+@@ -1441,6 +1448,13 @@
    ../include/numnicks.h ../include/querycmds.h ../include/ircd_features.h \
    ../include/s_misc.h ../include/s_stats.h ../include/send.h \
    ../include/struct.h ../include/sys.h
@@ -286,18 +286,18 @@ diff -r ed93c5ec7a2b 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 ed93c5ec7a2b ircd/client.c
---- a/ircd/client.c    Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/client.c    Tue Feb 03 19:05:37 2009 +0100
-@@ -178,6 +178,7 @@
+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
+@@ -184,6 +184,7 @@
      FlagSet(&privs_local, PRIV_WHOX);
      FlagSet(&privs_local, PRIV_DISPLAY);
      FlagSet(&privs_local, PRIV_FORCE_LOCAL_OPMODE);
 +    FlagSet(&privs_local, PRIV_LOCAL_WELCOME);
- 
-     privs_defaults_set = 1;
-   }
-@@ -225,6 +226,7 @@
+     FlagClr(&privs_local, PRIV_STAFF);
+     FlagClr(&privs_local, PRIV_CLAIM_NICK);
+     FlagClr(&privs_local, PRIV_GLINE_LOOKUP);
+@@ -264,6 +265,7 @@
      ClrPriv(client, PRIV_OPMODE);
      ClrPriv(client, PRIV_OPKICK);
      ClrPriv(client, PRIV_BADCHAN);
@@ -305,17 +305,17 @@ diff -r ed93c5ec7a2b ircd/client.c
    }
  }
  
-@@ -248,6 +250,7 @@
-   P(PARANOID),       P(CHECK),          P(WALL),          P(CLOSE),
-   P(ROUTE),          P(ROUTEINFO),      P(SERVERINFO),    P(CHANNEL_PRIVACY),
+@@ -289,6 +291,7 @@
    P(USER_PRIVACY),
+   P(STAFF),          P(CLAIM_NICK),     P(GLINE_LOOKUP),  P(HIDE_CHANS),
+   P(CHECK_CHANNEL),
 +  P(WELCOME),        P(LOCAL_WELCOME),
  #undef P
    { 0, 0 }
  };
-diff -r ed93c5ec7a2b ircd/ircd_features.c
---- a/ircd/ircd_features.c     Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/ircd_features.c     Tue Feb 03 19:05:37 2009 +0100
+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 @@
    F_I(IRCD_RES_TIMEOUT, 0, 4, 0),
    F_I(AUTH_TIMEOUT, 0, 9, 0),
@@ -332,43 +332,41 @@ diff -r ed93c5ec7a2b 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 ed93c5ec7a2b ircd/ircd_lexer.l
---- a/ircd/ircd_lexer.l        Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/ircd_lexer.l        Tue Feb 03 19:05:37 2009 +0100
-@@ -168,6 +168,8 @@
-   { "serverinfo", TPRIV_SERVERINFO },
-   { "user_privacy", TPRIV_USER_PRIVACY },
-   { "channel_privacy", TPRIV_CHANNEL_PRIVACY },
+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
+@@ -173,6 +173,8 @@
+   { "gline_lookup", TPRIV_GLINE_LOOKUP },
+   { "hide_chans", TPRIV_HIDE_CHANS },
+   { "check_channel", TPRIV_CHECK_CHANNEL },
 +  { "local_welcome", TPRIV_LOCAL_WELCOME },
 +  { "welcome", TPRIV_WELCOME },
    { NULL, 0 }
  };
  static int ntokens;
-diff -r ed93c5ec7a2b ircd/ircd_parser.y
---- a/ircd/ircd_parser.y       Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/ircd_parser.y       Tue Feb 03 19:05:37 2009 +0100
-@@ -189,7 +189,8 @@
- %token TPRIV_FORCE_OPMODE TPRIV_FORCE_LOCAL_OPMODE TPRIV_APASS_OPMODE
- %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
--%token TPRIV_CHANNEL_PRIVACY TPRIV_USER_PRIVACY TPRIV_LIST_CHAN 
-+%token TPRIV_CHANNEL_PRIVACY TPRIV_USER_PRIVACY TPRIV_LIST_CHAN
-+%token TPRIV_LOCAL_WELCOME TPRIV_WELCOME 
+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
+@@ -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
+ %token TPRIV_CHECK_CHANNEL
++%token TPRIV_LOCAL_WELCOME TPRIV_WELCOME
  /* and some types... */
  %type <num> sizespec
  %type <num> timespec timefactor factoredtimes factoredtime
-@@ -704,6 +705,8 @@
-           TPRIV_SERVERINFO { $$ = PRIV_SERVERINFO ; } |
-           TPRIV_CHANNEL_PRIVACY { $$ = PRIV_CHANNEL_PRIVACY ; } |
-           TPRIV_USER_PRIVACY { $$ = PRIV_USER_PRIVACY ; } |
+@@ -713,6 +714,8 @@
+           TPRIV_GLINE_LOOKUP { $$ = PRIV_GLINE_LOOKUP; } |
+           TPRIV_CHECK_CHANNEL { $$ = PRIV_CHECK_CHANNEL; } |
+           TPRIV_HIDE_CHANS { $$ = PRIV_HIDE_CHANS; } |
 +          TPRIV_LOCAL_WELCOME { $$ = PRIV_LOCAL_WELCOME; } |
 +          TPRIV_WELCOME { $$ = PRIV_WELCOME; } |
            TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
  yesorno: YES { $$ = 1; } | NO { $$ = 0; };
  
-diff -r ed93c5ec7a2b ircd/m_welcome.c
+diff -r 5169dae4207d ircd/m_welcome.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_welcome.c Tue Feb 03 19:05:37 2009 +0100
++++ b/ircd/m_welcome.c Wed Feb 04 17:58:05 2009 +0100
 @@ -0,0 +1,308 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/m_welcome.c
@@ -678,10 +676,10 @@ diff -r ed93c5ec7a2b ircd/m_welcome.c
 +  }
 +  return 0;
 +}
-diff -r ed93c5ec7a2b ircd/parse.c
---- a/ircd/parse.c     Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/parse.c     Tue Feb 03 19:05:37 2009 +0100
-@@ -667,6 +667,15 @@
+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
+@@ -674,6 +674,15 @@
      /* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
      { m_unregistered, m_not_oper, ms_opkick, mo_opkick, m_ignore, mh_nohelp }
    },
@@ -697,9 +695,9 @@ diff -r ed93c5ec7a2b 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 ed93c5ec7a2b ircd/s_err.c
---- a/ircd/s_err.c     Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/s_err.c     Tue Feb 03 19:05:37 2009 +0100
+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
 @@ -486,7 +486,7 @@
  /* 226 */
    { RPL_STATSALINE, "%s", "226" },
@@ -718,9 +716,9 @@ diff -r ed93c5ec7a2b ircd/s_err.c
  /* 510 */
    { 0 },
  /* 511 */
-diff -r ed93c5ec7a2b ircd/s_serv.c
---- a/ircd/s_serv.c    Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/s_serv.c    Tue Feb 03 19:05:37 2009 +0100
+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
 @@ -57,6 +57,7 @@
  #include "struct.h"
  #include "sys.h"
@@ -737,9 +735,9 @@ diff -r ed93c5ec7a2b ircd/s_serv.c
  
    /*
     * Pass on my client information to the new server
-diff -r ed93c5ec7a2b ircd/s_stats.c
---- a/ircd/s_stats.c   Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/s_stats.c   Tue Feb 03 19:05:37 2009 +0100
+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
 @@ -54,6 +54,7 @@
  #include "send.h"
  #include "struct.h"
@@ -762,9 +760,9 @@ diff -r ed93c5ec7a2b ircd/s_stats.c
    { 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
      stats_meminfo, 0,
      "List usage information." },
-diff -r ed93c5ec7a2b ircd/s_user.c
---- a/ircd/s_user.c    Tue Feb 03 18:41:29 2009 +0100
-+++ b/ircd/s_user.c    Tue Feb 03 19:05:37 2009 +0100
+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
 @@ -63,6 +63,7 @@
  #include "userload.h"
  #include "version.h"
@@ -773,7 +771,7 @@ diff -r ed93c5ec7a2b ircd/s_user.c
  
  #include "handlers.h" /* m_motd and m_lusers */
  
-@@ -411,6 +412,9 @@
+@@ -413,6 +414,9 @@
                             cli_info(sptr), NumNick(cptr) /* two %s's */);
  
      IPcheck_connect_succeeded(sptr);
@@ -783,9 +781,9 @@ diff -r ed93c5ec7a2b ircd/s_user.c
    }
    else {
      struct Client *acptr = user->server;
-diff -r ed93c5ec7a2b ircd/welcome.c
+diff -r 5169dae4207d ircd/welcome.c
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/welcome.c   Tue Feb 03 19:05:37 2009 +0100
++++ b/ircd/welcome.c   Wed Feb 04 17:58:05 2009 +0100
 @@ -0,0 +1,373 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/welcome.c