no need for inetntop* now - removed

[irc/rqf/shadowircd.git] / src / s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index 397ae0575869a8f2badd05f5473b6e11b6364a10..343203d9438ba0cb008fad3fc0bd250afc3c5979 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -84,7 +84,6 @@ struct Capability captab[] = {
        { "CHW",        CAP_CHW},
        { "IE",         CAP_IE},
        { "KLN",        CAP_KLN},
-       { "GLN",        CAP_GLN},
        { "KNOCK",      CAP_KNOCK},
        { "ZIP",        CAP_ZIP},
        { "TB",         CAP_TB},
@@ -947,7 +946,7 @@ server_estab(struct Client *client_p)
        {
                start_zlib_session(client_p);
        }
-       sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, rb_current_time());
+       sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, (long int)rb_current_time());
 
        client_p->servptr = &me;
 
@@ -1178,7 +1177,7 @@ serv_connect_resolved(struct Client *client_p)
        }
 
        /* log */
-       inetntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr);
+       rb_inet_ntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr);
        ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", client_p->name, client_p->sockhost, port,
 #ifdef RB_IPV6
                        server_p->aftype == AF_INET6 ? "IPv6" :
@@ -1232,7 +1231,7 @@ serv_connect_dns_callback(void *vptr, struct DNSReply *reply)
 #endif
                ((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = port;
        /* Set sockhost properly now -- jilles */
-       inetntop_sock((struct sockaddr *)&client_p->localClient->ip,
+       rb_inet_ntop_sock((struct sockaddr *)&client_p->localClient->ip,
                        client_p->sockhost, sizeof client_p->sockhost);
        serv_connect_resolved(client_p);
 }
@@ -1297,9 +1296,9 @@ serv_connect(struct server_conf *server_p, struct Client *by)
         * The sockhost may be a hostname, this will be corrected later
         * -- jilles
         */
-       strlcpy(client_p->name, server_p->name, sizeof(client_p->name));
-       strlcpy(client_p->host, server_p->host, sizeof(client_p->host));
-       strlcpy(client_p->sockhost, server_p->host, sizeof(client_p->sockhost));
+       rb_strlcpy(client_p->name, server_p->name, sizeof(client_p->name));
+       rb_strlcpy(client_p->host, server_p->host, sizeof(client_p->host));
+       rb_strlcpy(client_p->sockhost, server_p->host, sizeof(client_p->sockhost));
        client_p->localClient->F = F;
        add_to_cli_fd_hash(client_p);