removed showumodehtoclients - covered in sethost patch

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

diff --git a/checkoutput.patch b/checkoutput.patch
index b22bdb57a4aa47871b109bf5406c9e6d675c5ea3..5c023b896f72c8136ad7508a949d4318398260b2 100644 (file)
--- a/checkoutput.patch
+++ b/checkoutput.patch
@@ -4,10 +4,20 @@ changed hidden to delayedjoin,
 changed no modes <none> to just + same as /MODE shows
 added zombie and delayedjoin prefix to header for check channel
 changed all (timestamp) output to [timestamp] seems more consistent with other places (e.g. snomask HACK MODEs)
+added [<remote server>] param to syntax of command in the comments
 
-diff -r 8b5e0c204825 ircd/m_check.c
---- a/ircd/m_check.c   Tue Mar 23 14:12:09 2010 +0100
-+++ b/ircd/m_check.c   Tue Mar 23 14:13:56 2010 +0100
+diff -r a698927b198f ircd/m_check.c
+--- a/ircd/m_check.c
++++ b/ircd/m_check.c
+@@ -71,7 +71,7 @@
+  */
+ 
+ /*
+- * Syntax: CHECK <channel|nick|server|hostmask> [-flags]
++ * Syntax: CHECK [<remote server>] <channel|nick|server|hostmask> [-flags]
+  * 
+  * Where valid flags are:
+  * -c: Show channels when checking a hostmask.
 @@ -238,7 +238,7 @@
    char *zombie, *showlevel;
  
@@ -75,10 +85,9 @@ diff -r 8b5e0c204825 ircd/m_check.c
  
    /* Header */
 -  send_reply(sptr, RPL_DATASTR, " ");
--  send_reply(sptr, RPL_CHKHEAD, "channel", chptr->chname);
--  send_reply(sptr, RPL_DATASTR, " ");
 +  send_reply(sptr, RPL_DATASTR, ": ");
-+  send_reply(sptr, RPL_CHKHEAD, ":channel", chptr->chname);
+   send_reply(sptr, RPL_CHKHEAD, "channel", chptr->chname);
+-  send_reply(sptr, RPL_DATASTR, " ");
 +  send_reply(sptr, RPL_DATASTR, ": ");
  
    /* Creation Time */
@@ -145,10 +154,9 @@ diff -r 8b5e0c204825 ircd/m_check.c
  
    /* Header */
 -  send_reply(sptr, RPL_DATASTR, " ");
--  send_reply(sptr, RPL_CHKHEAD, "user", cli_name(acptr));
--  send_reply(sptr, RPL_DATASTR, " ");
 +  send_reply(sptr, RPL_DATASTR, ": ");
-+  send_reply(sptr, RPL_CHKHEAD, ":user", cli_name(acptr));
+   send_reply(sptr, RPL_CHKHEAD, "user", cli_name(acptr));
+-  send_reply(sptr, RPL_DATASTR, " ");
 +  send_reply(sptr, RPL_DATASTR, ": ");
  
 -  ircd_snprintf(0, outbuf, sizeof(outbuf), "           Nick:: %s (%s%s)", cli_name(acptr), NumNick(acptr));
@@ -276,10 +284,11 @@ diff -r 8b5e0c204825 ircd/m_check.c
    if (MyUser(acptr)) {
      os_get_peername(con_fd(cli_connect(sptr)), &sin);
  
-     send_reply(sptr, RPL_DATASTR, " ");
+-    send_reply(sptr, RPL_DATASTR, " ");
 -    ircd_snprintf(0, outbuf, sizeof(outbuf), "          Ports:: %d -> %d (client -> server)",
 -        sin.port, cli_listener(acptr)->addr.port);
 -    send_reply(sptr, RPL_DATASTR, outbuf);
++    send_reply(sptr, RPL_DATASTR, ": ");
 +    send_reply(sptr, SND_EXPLICIT | RPL_DATASTR, ":          Ports:: %d -> %d (client -> server)",
 +      sin.port, cli_listener(acptr)->addr.port);
      if (feature_bool(FEAT_EXTENDED_CHECKCMD)) {
@@ -315,10 +324,9 @@ diff -r 8b5e0c204825 ircd/m_check.c
  
    /* Header */
 -  send_reply(sptr, RPL_DATASTR, " ");
--  send_reply(sptr, RPL_CHKHEAD, "server", acptr->cli_name);
--  send_reply(sptr, RPL_DATASTR, " ");
 +  send_reply(sptr, RPL_DATASTR, ": ");
-+  send_reply(sptr, RPL_CHKHEAD, ":server", acptr->cli_name);
+   send_reply(sptr, RPL_CHKHEAD, "server", acptr->cli_name);
+-  send_reply(sptr, RPL_DATASTR, " ");
 +  send_reply(sptr, RPL_DATASTR, ": ");
  
 -  ircd_snprintf(0, outbuf, sizeof(outbuf), "   Connected at:: %s (%Tu)", myctime(acptr->cli_serv->timestamp), acptr->cli_serv->timestamp);
@@ -406,9 +414,8 @@ diff -r 8b5e0c204825 ircd/m_check.c
        if (count == 0) {
          /* Output header */ 
 -        send_reply(sptr, RPL_DATASTR, " ");
--        send_reply(sptr, RPL_CHKHEAD, "host", targhost);
 +        send_reply(sptr, RPL_DATASTR, ": ");
-+        send_reply(sptr, RPL_CHKHEAD, ":host", targhost);
+         send_reply(sptr, RPL_CHKHEAD, "host", targhost);
  
 -        send_reply(sptr, RPL_DATASTR, " ");
 +        send_reply(sptr, RPL_DATASTR, ": ");
@@ -510,9 +517,9 @@ diff -r 8b5e0c204825 ircd/m_check.c
      send_reply(sptr, RPL_ENDOFCHECK, " ");
    }
  
-diff -r 8b5e0c204825 ircd/s_err.c
---- a/ircd/s_err.c     Tue Mar 23 14:12:09 2010 +0100
-+++ b/ircd/s_err.c     Tue Mar 23 14:13:56 2010 +0100
+diff -r a698927b198f ircd/s_err.c
+--- a/ircd/s_err.c
++++ b/ircd/s_err.c
 @@ -612,7 +612,7 @@
  /* 289 */
    { 0 },