diff options
| author | Adam <Adam@anope.org> | 2011-03-05 18:18:51 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-03-05 18:18:51 -0500 |
| commit | ef0c0957126dea31eb1ee5acf28b6d9f6833b60c (patch) | |
| tree | 6f401cf7ac99d7aedf858d8309ba0a6cff14e983 | |
| parent | a0355dfd9de6d7366ed23e62e16d1e945dd28776 (diff) | |
Made m_ldap_oper understand deopering
| -rw-r--r-- | modules/extra/m_ldap.cpp | 6 | ||||
| -rw-r--r-- | modules/extra/m_ldap_oper.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp index 1d5aeca09..47c0c4067 100644 --- a/modules/extra/m_ldap.cpp +++ b/modules/extra/m_ldap.cpp @@ -115,7 +115,6 @@ class LDAPService : public LDAPProvider, public Thread, public Condition if (type <= 0 || this->GetExitState()) continue; - bool notify = false; int cur_id = ldap_msgid(result); this->Lock(); @@ -152,7 +151,6 @@ class LDAPService : public LDAPProvider, public Thread, public Condition ldap_result->error = ldap_err2string(parse_result); else if (errcode != LDAP_SUCCESS) ldap_result->error = ldap_err2string(errcode); - notify = true; break; } case LDAP_RES_SEARCH_ENTRY: @@ -175,7 +173,6 @@ class LDAPService : public LDAPProvider, public Thread, public Condition if (ber != NULL) ber_free(ber, 0); - notify = true; break; } default: @@ -192,8 +189,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition this->results.push_back(std::make_pair(i, ldap_result)); this->Unlock(); - if (notify) - me->Notify(); + me->Notify(); } } diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp index 8e08587d2..8a5f57116 100644 --- a/modules/extra/m_ldap_oper.cpp +++ b/modules/extra/m_ldap_oper.cpp @@ -49,7 +49,11 @@ class IdentifyInterface : public LDAPInterface } catch (const LDAPException &ex) { - Log() << "m_ldap_oper: " << ex.GetReason(); + if (u->Account()->ot != NULL) + { + u->Account()->ot = NULL; + Log() << "m_ldap_oper: Removed services operator from " << u->nick << " (" << u->Account()->display << ")"; + } } } |