diff options
| author |  Daniel De Graaf | 2010-04-16 21:45:09 -0500 |
|---|---|---|
| committer | Daniel De Graaf | 2010-08-03 17:32:42 -0400 |
| commit | 0cb2a2b099ad8e5fd1b4532158dcc8937c5ea736 (patch) | |
| tree | fc7cdce4b78d94aa4d2c9ae6d83e54efee55a996 /src/modules/m_spanningtree/server.cpp | |
| parent | Check maximum length of ban list for local users, not remote (diff) | |
Fix crash when a remote server has the same name as we do
Diffstat (limited to 'src/modules/m_spanningtree/server.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/server.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp index fa3115ada..7d6f0e1fa 100644 --- a/src/modules/m_spanningtree/server.cpp +++ b/src/modules/m_spanningtree/server.cpp @@ -223,8 +223,9 @@ bool TreeSocket::Inbound_Server(parameterlist ¶ms) TreeServer* CheckDupe = Utils->FindServer(sname); if (CheckDupe) { - this->SendError("Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); - ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); + std::string pname = CheckDupe->GetParent() ? CheckDupe->GetParent()->GetName() : "<ourself>"; + SendError("Server "+sname+" already exists on server "+pname+"!"); + ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+pname); return false; } |