From 6008896554e40ad444e064bca0f15cc2e65d4e43 Mon Sep 17 00:00:00 2001 From: Aaron Jones Date: Wed, 31 Aug 2016 14:13:45 +0000 Subject: [PATCH] Backport ffedad8d to release/3.5 --- src/s_serv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/s_serv.c b/src/s_serv.c index 65058d1d..13c93c3c 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -800,7 +800,7 @@ server_estab(struct Client *client_p) EmptyString(server_p->spasswd) ? "*" : server_p->spasswd, TS_CURRENT, me.id); /* pass info to new server */ - send_capabilities(client_p, default_server_capabs + send_capabilities(client_p, default_server_capabs | CAP_MASK | (ServerConfCompressed(server_p) ? CAP_ZIP_SUPPORTED : 0) | (ServerConfTb(server_p) ? CAP_TB : 0)); @@ -1357,7 +1357,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) EmptyString(server_p->spasswd) ? "*" : server_p->spasswd, TS_CURRENT, me.id); /* pass my info to the new server */ - send_capabilities(client_p, default_server_capabs + send_capabilities(client_p, default_server_capabs | CAP_MASK | (ServerConfCompressed(server_p) ? CAP_ZIP_SUPPORTED : 0) | (ServerConfTb(server_p) ? CAP_TB : 0));