From 17c97c84420b8a96cf47ba1b2faa672fc3dc17f0 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 19 Sep 2010 14:10:43 +0000 Subject: [PATCH] - Fixed notices to opers about server delinks not being broadcasted to all other servers if they were on SSL links. Reported by chotaire (#0003957). --- Changes | 2 ++ src/ssl.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 973e2ab80..559c49a77 100644 --- a/Changes +++ b/Changes @@ -2141,3 +2141,5 @@ - Add a modules section to the documentation. This was created to put all documentation specific to the m_post module in one, easy to find place. The documentation on m_post is likely incomplete, however. +- Fixed notices to opers about server delinks not being broadcasted to all + other servers if they were on SSL links. Reported by chotaire (#0003957). diff --git a/src/ssl.c b/src/ssl.c index d88701c71..36933508b 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -695,6 +695,7 @@ static int fatal_ssl_error(int ssl_error, int where, aClient *sptr) /* sendto_failops_whoare_opers("Closing link: SSL_connect(): %s - %s", myerr, get_client_name(sptr, FALSE)); */ sendto_umode(UMODE_OPER, "Lost connection to %s: %s: %s", get_client_name(sptr, FALSE), ssl_func, myerr); + /* This is a connect() that fails, we don't broadcast that for non-SSL either (noisy) */ } else if ((IsServer(sptr) || (sptr->serv && sptr->serv->conf)) && (where != SAFE_SSL_WRITE)) { @@ -702,8 +703,9 @@ static int fatal_ssl_error(int ssl_error, int where, aClient *sptr) * and not writing (since otherwise deliver_it will take care of the error), THEN * send a closing link error... */ - sendto_umode(UMODE_OPER, "Lost connection to %s: %s: %s", - get_client_name(sptr, FALSE), ssl_func, ssl_errstr); + sendto_locfailops("Lost connection to %s: %s: %s", get_client_name(sptr, FALSE), ssl_func, ssl_errstr); + sendto_serv_butone(&me, ":%s GLOBOPS :Lost connection to server %s: %s: %s", + me.name, get_client_name(sptr, FALSE), ssl_func, ssl_errstr); /* sendto_failops_whoare_opers("Closing link: %s: %s - %s", ssl_func, ssl_errstr, get_client_name(sptr, FALSE)); */ }