diff options
| author | Timothy Pearson <[email protected]> | 2013-02-16 01:18:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-16 01:18:00 -0600 |
| commit | 0794d3cc445f08c173170d8a2168248d25227ce1 (patch) | |
| tree | 39c680affd4d61d5c635db793b82d8b99f201e32 | |
| parent | b9e5443b1aab47fcf49fb2304569dd2187b02b42 (diff) | |
| download | libtdeldap-0794d3cc445f08c173170d8a2168248d25227ce1.tar.gz libtdeldap-0794d3cc445f08c173170d8a2168248d25227ce1.zip | |
Fix FTBFS with older OpenLDAP versions
| m--------- | admin | 0 | ||||
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | src/libtdeldap.cpp | 5 |
3 files changed, 4 insertions, 1 deletions
diff --git a/admin b/admin -Subproject 50c595422f05af2f2e1457ee3d27f8e5ce1ab35 +Subproject 39466b7b95f25a3e0f6da52b156b194b10cbac9 diff --git a/cmake b/cmake -Subproject 5438330f961347e3026326e78e0e70a1ec083aa +Subproject 274366fb8b90704586d7beef216b765cc0688b0 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); |