Fix typos in comments and strings to reduce future slumming for credit.

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

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 7d9269258d1010cc1e4851f89c8943d6b6de11f6..14ea9868076c91ad6a3b333c0af1e1425ab284bd 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -34,6 +34,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "ircd_snprintf.h"
@@ -57,7 +58,7 @@
 #include "sys.h"
 #include "userload.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 
@@ -127,7 +128,7 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
     /*
      *  Pass my info to the new server
      */
-    sendrawto_one(cptr, MSG_SERVER " %s 1 %Tu %Tu J%s %s%s +%s :%s",
+    sendrawto_one(cptr, MSG_SERVER " %s 1 %Tu %Tu J%s %s%s +%s6 :%s",
                  cli_name(&me), cli_serv(&me)->timestamp,
                  cli_serv(cptr)->timestamp, MAJOR_PROTOCOL, NumServCap(&me),
                  feature_bool(FEAT_HUB) ? "h" : "",
@@ -137,10 +138,10 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
      * XXX - if this comes from a server port, it will not have been added
      * to the IP check registry, see add_connection in s_bsd.c
      */
-    IPcheck_connect_fail(&cli_ip(cptr));
+    IPcheck_connect_fail(cptr);
   }
 
-  det_confs_butmask(cptr, CONF_LEAF | CONF_HUB | CONF_SERVER | CONF_UWORLD);
+  det_confs_butmask(cptr, CONF_SERVER | CONF_UWORLD);
 
   if (!IsHandshake(cptr))
     hAddClient(cptr);
@@ -209,8 +210,8 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
    * Pass on my client information to the new server
    *
    * First, pass only servers (idea is that if the link gets
-   * cancelled beacause the server was already there,
-   * there are no NICK's to be cancelled...). Of course,
+   * canceled because the server was already there,
+   * there are no NICK's to be canceled...). Of course,
    * if cancellation occurs, all this info is sent anyway,
    * and I guess the link dies when a read is attempted...? --msa
    *
@@ -257,7 +258,7 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
                    cli_name(acptr), cli_hopcount(acptr) + 1, cli_lastnick(acptr),
                    cli_user(acptr)->username, cli_user(acptr)->realhost,
                    *s ? "+" : "", s, *s ? " " : "",
-                   iptobase64(xxx_buf, &cli_ip(acptr), sizeof(xxx_buf)),
+                   iptobase64(xxx_buf, &cli_ip(acptr), sizeof(xxx_buf), IsIPv6(cptr)),
                    NumNick(acptr), cli_info(acptr));
     }
   }