X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ldap.cpp;h=fc1bee939c9369a07b6741d9ed712b0000665cd2;hb=bf66b6dedd226b9967d876a3869b1766af38d596;hp=c1102583600d1defcb15f6215725a6d218a19e5e;hpb=cd268bb2d5d1740233d150e2f3877f7f136d3512;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index c11025836..fc1bee939 100644
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -17,9 +17,19 @@
* along with this program. If not, see .
*/
+/// $LinkerFlags: -llber -lldap_r
+
+/// $PackageInfo: require_system("centos") openldap-devel
+/// $PackageInfo: require_system("ubuntu") libldap2-dev
+
#include "inspircd.h"
#include "modules/ldap.h"
+// Ignore OpenLDAP deprecation warnings on OS X Yosemite and newer.
+#if defined __APPLE__
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
#include
#ifdef _WIN32
@@ -27,8 +37,6 @@
# pragma comment(lib, "liblber.lib")
#endif
-/* $LinkerFlags: -lldap_r */
-
class LDAPService;
class LDAPRequest
@@ -170,7 +178,6 @@ class LDAPService : public LDAPProvider, public SocketThread
time_t last_connect;
int searchscope;
time_t timeout;
- time_t last_timeout_check;
public:
static LDAPMod** BuildMods(const LDAPMods& attributes)
@@ -247,7 +254,7 @@ class LDAPService : public LDAPProvider, public SocketThread
LDAPService(Module* c, ConfigTag* tag)
: LDAPProvider(c, "LDAP/" + tag->getString("id"))
- , con(NULL), config(tag), last_connect(0), last_timeout_check(0)
+ , con(NULL), config(tag), last_connect(0)
{
std::string scope = config->getString("searchscope");
if (scope == "base")