Commit a20dd5e5 authored by Ahmad Samir's avatar Ahmad Samir
Browse files

Cleanup ldap_extended_operation/_s related buildsystem code

- remove check_symbol_exists(), check_function_exists() should be enough
- fix check for HAVE_LDAP_EXTENDED_OPERATION_S before ldap_extended_operation_s
  is used
parent 2f084272
Pipeline #189199 passed with stage
in 1 minute and 50 seconds
......@@ -21,8 +21,6 @@ if(Ldap_FOUND)
check_function_exists(ldap_unbind_ext HAVE_LDAP_UNBIND_EXT)
check_function_exists(ldap_extended_operation HAVE_LDAP_EXTENDED_OPERATION)
check_function_exists(ldap_extended_operation_s HAVE_LDAP_EXTENDED_OPERATION_S)
check_symbol_exists(ldap_extended_operation ldap.h HAVE_LDAP_EXTENDED_OPERATION_PROTOTYPE)
check_symbol_exists(ldap_extended_operation_s ldap.h HAVE_LDAP_EXTENDED_OPERATION_S_PROTOTYPE)
endif()
set(kldap_EXTRA_LIBS ${kldap_EXTRA_LIBS} Sasl2::Sasl2)
......
......@@ -1039,7 +1039,7 @@ int LdapOperation::compare_s(const LdapDN &dn, const QString &attr, const QByteA
int LdapOperation::exop(const QString &oid, const QByteArray &data)
{
Q_ASSERT(d->mConnection);
#if defined(HAVE_LDAP_EXTENDED_OPERATION) && defined(HAVE_LDAP_EXTENDED_OPERATION_PROTOTYPE)
#if HAVE_LDAP_EXTENDED_OPERATION
LDAP *ld = (LDAP *)d->mConnection->handle();
int msgid;
......@@ -1073,7 +1073,7 @@ int LdapOperation::exop(const QString &oid, const QByteArray &data)
int LdapOperation::exop_s(const QString &oid, const QByteArray &data)
{
#if defined(HAVE_LDAP_EXTENDED_OPERATION) && defined(HAVE_LDAP_EXTENDED_OPERATION_PROTOTYPE)
#if HAVE_LDAP_EXTENDED_OPERATION_S
Q_ASSERT(d->mConnection);
LDAP *ld = (LDAP *)d->mConnection->handle();
BerValue *retdata;
......
#cmakedefine HAVE_LDAP_EXTENDED_OPERATION
#cmakedefine HAVE_LDAP_EXTENDED_OPERATION_S
#cmakedefine HAVE_LDAP_EXTENDED_OPERATION_PROTOTYPE
#cmakedefine HAVE_LDAP_EXTENDED_OPERATION_S_PROTOTYPE
#cmakedefine01 HAVE_LDAP_EXTENDED_OPERATION
#cmakedefine01 HAVE_LDAP_EXTENDED_OPERATION_S
#cmakedefine01 LDAP_FOUND
#cmakedefine01 HAVE_WINLDAP_H
#cmakedefine01 HAVE_SYS_TIME_H
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment