summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-03-13 22:59:50 -0400
committerAdam <Adam@anope.org>2011-03-13 22:59:50 -0400
commit4fe49af8401b956249d924b89b3e69bce5fb6744 (patch)
tree41b5dd5df552dab0eed37bab5cfb81233bf04367
parentbeabbb3a209874ce04d7ee3c2948ad80b8282383 (diff)
Fixed a crash in m_ldap is unloaded
-rw-r--r--modules/extra/m_ldap.cpp2
-rw-r--r--modules/extra/ns_identify_ldap.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp
index 47c0c4067..aeb0500e3 100644
--- a/modules/extra/m_ldap.cpp
+++ b/modules/extra/m_ldap.cpp
@@ -221,6 +221,8 @@ class ModuleLDAP : public Module, public Pipe
{
it->second->SetExitState();
it->second->Wakeup();
+ it->second->Join();
+ delete it->second;
}
LDAPServices.clear();
}
diff --git a/modules/extra/ns_identify_ldap.cpp b/modules/extra/ns_identify_ldap.cpp
index 08b06a18a..bf98cbeac 100644
--- a/modules/extra/ns_identify_ldap.cpp
+++ b/modules/extra/ns_identify_ldap.cpp
@@ -217,7 +217,7 @@ class NSIdentifyLDAP : public Module
void OnNickIdentify(User *u)
{
- if (email_attribute.empty())
+ if (email_attribute.empty() || !this->ldap)
return;
try