Author: Ghostwolf <foxxe@wtfs.net>

[ircu2.10.12-pk.git] / ircd / parse.c

diff --git a/ircd/parse.c b/ircd/parse.c
index 152ef99d02797fbee893434da702cd837a4e1aa5..9e19f8f425279f5e80fe4d825e94b24da41750e9 100644 (file)
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -19,6 +19,8 @@
  *
  * $Id$
  */
+#include "config.h"
+
 #include "parse.h"
 #include "client.h"
 #include "channel.h"
@@ -28,6 +30,7 @@
 #include "ircd_alloc.h"
 #include "ircd_chattr.h"
 #include "ircd_features.h"
+#include "ircd_policy.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -181,6 +184,13 @@ struct Message msgtab[] = {
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
     { m_unregistered, m_not_oper, ms_wallops, mo_wallops, m_ignore }
   },
+  {
+    MSG_WALLUSERS,
+    TOK_WALLUSERS,
+    0, MAXPARA, MFLG_SLOW, 0,
+    /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+    { m_unregistered, m_not_oper, ms_wallusers, mo_wallusers, m_ignore }
+  },
   {
     MSG_DESYNCH,
     TOK_DESYNCH,
@@ -193,7 +203,7 @@ struct Message msgtab[] = {
     TOK_PING,
     0, MAXPARA, MFLG_SLOW, 0,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
-    { m_unregistered, m_ping, ms_ping, m_ping, m_ignore }
+    { m_unregistered, m_ping, ms_ping, mo_ping, m_ignore }
   },
   {
     MSG_PONG,
@@ -207,7 +217,7 @@ struct Message msgtab[] = {
     TOK_ERROR,
     0, MAXPARA, MFLG_SLOW | MFLG_UNREG, 0,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
-    { m_ignore, m_ignore, ms_error, m_ignore, m_ignore }
+    { mr_error, m_ignore, ms_error, m_ignore, m_ignore }
   },
   {
     MSG_KILL,
@@ -256,7 +266,7 @@ struct Message msgtab[] = {
     TOK_WHOIS,
     0, MAXPARA, MFLG_SLOW, 0,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
-    { m_unregistered, m_whois, m_whois, m_whois, m_ignore }
+    { m_unregistered, m_whois, ms_whois, m_whois, m_ignore }
   },
   {
     MSG_WHO,
@@ -305,7 +315,11 @@ struct Message msgtab[] = {
     TOK_TRACE,
     0, MAXPARA, MFLG_SLOW, 0,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+#ifdef HEAD_IN_SAND_TRACE
+    { m_unregistered, m_not_oper, ms_trace, mo_trace, m_ignore }
+#else
     { m_unregistered, m_trace, ms_trace, mo_trace, m_ignore }
+#endif
   },
   {
     MSG_PASS,
@@ -368,14 +382,18 @@ struct Message msgtab[] = {
     TOK_MAP,
     0, MAXPARA, MFLG_SLOW, 0,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+#ifdef HEAD_IN_SAND_MAP
+    { m_unregistered, m_map_redirect, m_ignore, m_map, m_ignore }
+#else
     { m_unregistered, m_map, m_ignore, m_map, m_ignore }
+#endif
   },
   {
     MSG_VERSION,
     TOK_VERSION,
     0, MAXPARA, MFLG_SLOW | MFLG_UNREG, 0,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
-    { m_version, m_version, ms_version, m_version, m_ignore }
+    { m_version, m_version, ms_version, mo_version, m_ignore }
   },
   {
     MSG_STATS,
@@ -389,14 +407,18 @@ struct Message msgtab[] = {
     TOK_LINKS,
     0, MAXPARA, MFLG_SLOW, 0,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+#ifdef HEAD_IN_SAND_LINKS
+    { m_unregistered, m_links_redirect, ms_links, m_links, m_ignore }
+#else
     { m_unregistered, m_links, ms_links, m_links, m_ignore }
+#endif
   },
   {
     MSG_ADMIN,
     TOK_ADMIN,
     0, MAXPARA, MFLG_SLOW | MFLG_UNREG, 0,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
-    { m_admin, m_admin, ms_admin, m_admin, m_ignore }
+    { m_admin, m_admin, ms_admin, mo_admin, m_ignore }
   },
   {
     MSG_HELP,
@@ -552,6 +574,13 @@ struct Message msgtab[] = {
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
     { m_unregistered, m_not_oper, m_ignore, mo_privs, m_ignore }
   },
+  {
+    MSG_ACCOUNT,
+    TOK_ACCOUNT,
+    0, MAXPARA, MFLG_SLOW, 0,
+    /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+    { m_ignore, m_ignore, ms_account, m_ignore, m_ignore }
+  },
   /* This command is an alias for QUIT during the unregistered part of
    * of the server.  This is because someone jumping via a broken web
    * proxy will send a 'POST' as their first command - which we will
@@ -564,9 +593,9 @@ struct Message msgtab[] = {
     0, MAXPARA, MFLG_SLOW, 0,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
     { m_quit, m_ignore, m_ignore, m_ignore, m_ignore }
-  },  
+  },
   { 0 }
-}; 
+};
 
 
 static char *para[MAXPARA + 2]; /* leave room for prefix and null */
@@ -694,7 +723,7 @@ static struct Message *do_msg_tree_cmd(struct MessageTree *mtree, char *prefix,
     }
     return mptr;
   }
-  /* 
+  /*
    * This should never happen
    */
   assert(0);
@@ -723,7 +752,7 @@ void initmsgtree(void)
   int ii;
   struct Message **msgtab_tok;
   struct Message **msgtok;
-  
+
   for (i = 0; msg->cmd; ++i, ++msg)
     continue;
   qsort(msgtab, i, sizeof(struct Message),
@@ -1012,7 +1041,7 @@ int parse_server(struct Client *cptr, char *buffer, char *bufend)
     }
     else if (' ' == ch[1] || ' ' == ch[2])
       from = FindNServer(numeric_prefix);
-    else 
+    else
       from = findNUser(numeric_prefix);
 
     do