From adc3349b11cb396b1c957245f8e5a89396959144 Mon Sep 17 00:00:00 2001 From: brain Date: Mon, 19 Dec 2005 15:25:40 +0000 Subject: Fixed broken display of 'aes enabled' git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2575 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 09a3b2c56..10da3222c 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -572,7 +572,7 @@ class TreeSocket : public InspSocket this->LinkState = WAIT_AUTH_1; } - void InitAES(std::string key) + void InitAES(std::string key,std::string SName) { if (key == "") return; @@ -588,11 +588,6 @@ class TreeSocket : public InspSocket } else { - std::string SName = myhost; - if (InboundServerName != "") - { - SName = InboundServerName; - } WriteOpers("\2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str()); ctx->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\ \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength); @@ -618,7 +613,7 @@ class TreeSocket : public InspSocket if (x->EncryptionKey != "") { this->WriteLine("AES "+Srv->GetServerName()); - this->InitAES(x->EncryptionKey); + this->InitAES(x->EncryptionKey,x->Name); } /* found who we're supposed to be connecting to, send the neccessary gubbins. */ this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+Srv->GetServerDescription()); @@ -1719,7 +1714,7 @@ class TreeSocket : public InspSocket { if ((x->EncryptionKey != "") && (x->Name == sserv)) { - this->InitAES(x->EncryptionKey); + this->InitAES(x->EncryptionKey,sserv); } } return true; -- cgit v1.2.3