From 0794d3cc445f08c173170d8a2168248d25227ce1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 16 Feb 2013 01:18:00 -0600 Subject: Fix FTBFS with older OpenLDAP versions --- admin | 2 +- cmake | 2 +- src/libtdeldap.cpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/admin b/admin index 50c5954..39466b7 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 50c595422f05af2f2e1457ee3d27f8e5ce1ab35d +Subproject commit 39466b7b95f25a3e0f6da52b156b194b10cbac9d diff --git a/cmake b/cmake index 5438330..274366f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 5438330f961347e3026326e78e0e70a1ec083aaf +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp index 6d61ab2..f9cc4f0 100644 --- a/src/libtdeldap.cpp +++ b/src/libtdeldap.cpp @@ -313,7 +313,9 @@ int LDAPManager::bind(TQString* errstr) { } if (m_creds->use_gssapi) { - //retcode = ldap_sasl_interactive_bind_s(m_ldap, "", "GSSAPI", NULL, NULL, LDAP_SASL_AUTOMATIC, sasl_bind_interact_callback, NULL); +#if LDAP_VENDOR_VERSION < 20425 + retcode = ldap_sasl_interactive_bind_s(m_ldap, "", "GSSAPI", NULL, NULL, LDAP_SASL_AUTOMATIC, sasl_bind_interact_callback, NULL); +#else // LDAP_VENDOR_VERSION const char* rmech = NULL; LDAPMessage* result = NULL; int msgid; @@ -343,6 +345,7 @@ int LDAPManager::bind(TQString* errstr) { } } } +#endif // LDAP_VENDOR_VERSION } else { retcode = ldap_sasl_bind_s(m_ldap, ldap_dn.ascii(), mechanism, &cred, NULL, NULL, NULL); -- cgit v1.2.1