Spring cleaning redux:

[solanum.git] / src / s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index 7c7e10dbeebfa55726a8f3218e6dd69d163c2a52..cf0dd391456537fda29842f898ff9b1e7afed036 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -127,6 +127,8 @@ init_builtin_capabs(void)
        CAP_MLOCK = capability_put(serv_capindex, "MLOCK");
 
        capability_require(serv_capindex, "QS");
+       capability_require(serv_capindex, "EX");
+       capability_require(serv_capindex, "IE");
        capability_require(serv_capindex, "ENCAP");
 }
 
@@ -576,7 +578,7 @@ burst_TS6(struct Client *client_p)
                if(!IsPerson(target_p))
                        continue;
 
-               send_umode(NULL, target_p, 0, 0, ubuf);
+               send_umode(NULL, target_p, 0, ubuf);
                if(!*ubuf)
                {
                        ubuf[0] = '+';
@@ -994,14 +996,14 @@ serv_connect_resolved(struct Client *client_p)
 
        if(ServerConfVhosted(server_p))
        {
-               memcpy(&myipnum, &server_p->my_ipnum, sizeof(myipnum));
+               memcpy(&myipnum, &server_p->my_ipnum, sizeof(server_p->my_ipnum));
                ((struct sockaddr_in *)&myipnum)->sin_port = 0;
                myipnum.ss_family = server_p->aftype;
 
        }
        else if(server_p->aftype == AF_INET && ServerInfo.specific_ipv4_vhost)
        {
-               memcpy(&myipnum, &ServerInfo.ip, sizeof(myipnum));
+               memcpy(&myipnum, &ServerInfo.ip, sizeof(ServerInfo.ip));
                ((struct sockaddr_in *)&myipnum)->sin_port = 0;
                myipnum.ss_family = AF_INET;
                SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in));
@@ -1010,7 +1012,7 @@ serv_connect_resolved(struct Client *client_p)
 #ifdef RB_IPV6
        else if((server_p->aftype == AF_INET6) && ServerInfo.specific_ipv6_vhost)
        {
-               memcpy(&myipnum, &ServerInfo.ip6, sizeof(myipnum));
+               memcpy(&myipnum, &ServerInfo.ip6, sizeof(ServerInfo.ip6));
                ((struct sockaddr_in6 *)&myipnum)->sin6_port = 0;
                myipnum.ss_family = AF_INET6;
                SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in6));