Fix FTBFS with older OpenLDAP versions

pull/1/head
Timothy Pearson 11 years ago
parent b9e5443b1a
commit 0794d3cc44

@ -1 +1 @@
Subproject commit 50c595422f05af2f2e1457ee3d27f8e5ce1ab35d
Subproject commit 39466b7b95f25a3e0f6da52b156b194b10cbac9d

@ -1 +1 @@
Subproject commit 5438330f961347e3026326e78e0e70a1ec083aaf
Subproject commit 274366fb8b90704586d7beef216b765cc0688b08

@ -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);

Loading…
Cancel
Save