Re: svn commit: r1917094 [1/3] - in /apr/apr/trunk: ./ build/ docs/ include/ include/private/ ldap/ misc/unix/ test/

On 4/18/24 9:32 AM, [email protected] wrote:
> Author: minfrin
> Date: Thu Apr 18 07:32:13 2024
> New Revision: 1917094
> 
> URL: http://svn.apache.org/viewvc?rev=1917094&view=rev
> Log:
> apr_ldap: Add the new APR LDAP API.
> 
> - Async API, can be used safely in event driven code.
> - Requests are tied into a pool lifetime, with abandon if the pool is
>   cleaned early.
> - Initial support for SASL bind, compare and search.
> - Backportable to apr-util v1.7.
> - Test case with example implementation.
> - Unmaintained Mozilla/Netware API support removed.
> - Rebind removed pending async re-implementation.
> - Doxygen docs.
> 
> Added:
>     apr/apr/trunk/build/ldap.m4
>     apr/apr/trunk/include/private/apr_ldap_internal.h   (with props)
>     apr/apr/trunk/ldap/
>     apr/apr/trunk/ldap/apr_ldap.c   (with props)
>     apr/apr/trunk/ldap/apr_ldap_stub.c   (with props)
>     apr/apr/trunk/ldap/apr_ldap_url.c   (with props)
> Modified:
>     apr/apr/trunk/CHANGES
>     apr/apr/trunk/CMakeLists.txt
>     apr/apr/trunk/Makefile.in
>     apr/apr/trunk/build.conf
>     apr/apr/trunk/build/dso.m4
>     apr/apr/trunk/configure.in
>     apr/apr/trunk/docs/doxygen.conf
>     apr/apr/trunk/include/apr.h.in
>     apr/apr/trunk/include/apr.hnw
>     apr/apr/trunk/include/apr.hw
>     apr/apr/trunk/include/apr.hwc
>     apr/apr/trunk/include/apu_errno.h
>     apr/apr/trunk/misc/unix/errorcodes.c
>     apr/apr/trunk/test/Makefile.in
>     apr/apr/trunk/test/Makefile.win
>     apr/apr/trunk/test/abts_tests.h
>     apr/apr/trunk/test/testutil.h
> 

This causes httpd trunk to fail compile against apr trunk even when I apply the following patch to

include/util_ldap.h

Index: include/util_ldap.h
===================================================================
--- include/util_ldap.h	(revision 1920017)
+++ include/util_ldap.h	(working copy)
@@ -29,12 +29,7 @@
 #include "apr_tables.h"
 #include "apr_time.h"
 #include "apr_version.h"
-#if APR_MAJOR_VERSION < 2
-/* The LDAP API is currently only present in APR 1.x */
 #include "apr_ldap.h"
-#else
-#define APR_HAS_LDAP 0
-#endif

 #if APR_HAS_SHARED_MEMORY
 #include "apr_rmm.h"


In file included from exports.c:55:
/usr/src/apache/httpd-trunk/include/util_ldap.h:94:11: error: ‘LDAP_DEREF_NEVER’ undeclared here (not in a function); did you mean
‘APR_LDAP_DEREF_NEVER’?
     never=LDAP_DEREF_NEVER,
           ^~~~~~~~~~~~~~~~
           APR_LDAP_DEREF_NEVER
/usr/src/apache/httpd-trunk/include/util_ldap.h:95:15: error: ‘LDAP_DEREF_SEARCHING’ undeclared here (not in a function); did you
mean ‘APR_LDAP_DEREF_SEARCHING’?
     searching=LDAP_DEREF_SEARCHING,
               ^~~~~~~~~~~~~~~~~~~~
               APR_LDAP_DEREF_SEARCHING
/usr/src/apache/httpd-trunk/include/util_ldap.h:96:13: error: ‘LDAP_DEREF_FINDING’ undeclared here (not in a function); did you
mean ‘APR_LDAP_DEREF_FINDING’?
     finding=LDAP_DEREF_FINDING,
             ^~~~~~~~~~~~~~~~~~
             APR_LDAP_DEREF_FINDING
/usr/src/apache/httpd-trunk/include/util_ldap.h:97:12: error: ‘LDAP_DEREF_ALWAYS’ undeclared here (not in a function); did you
mean ‘APR_LDAP_DEREF_ALWAYS’?
     always=LDAP_DEREF_ALWAYS
            ^~~~~~~~~~~~~~~~~
            APR_LDAP_DEREF_ALWAYS
/usr/src/apache/httpd-trunk/include/util_ldap.h:102:5: error: unknown type name ‘LDAP’
     LDAP *ldap;
     ^~~~
make[2]: *** [/usr/src/apache/httpd-trunk/build/rules.mk:207: exports.lo] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/usr/src/apache/httpd-trunk/build/rules.mk:75: all-recursive] Error 1
make: *** [/usr/src/apache/httpd-trunk/build/rules.mk:75: all-recursive] Error 1
In file included from exports.c:55:
/usr/src/apache/httpd-trunk/include/util_ldap.h:94:11: error: ‘LDAP_DEREF_NEVER’ undeclared here (not in a function); did you mean
‘APR_LDAP_DEREF_NEVER’?
     never=LDAP_DEREF_NEVER,
           ^~~~~~~~~~~~~~~~
           APR_LDAP_DEREF_NEVER
/usr/src/apache/httpd-trunk/include/util_ldap.h:95:15: error: ‘LDAP_DEREF_SEARCHING’ undeclared here (not in a function); did you
mean ‘APR_LDAP_DEREF_SEARCHING’?
     searching=LDAP_DEREF_SEARCHING,
               ^~~~~~~~~~~~~~~~~~~~
               APR_LDAP_DEREF_SEARCHING
/usr/src/apache/httpd-trunk/include/util_ldap.h:96:13: error: ‘LDAP_DEREF_FINDING’ undeclared here (not in a function); did you
mean ‘APR_LDAP_DEREF_FINDING’?
     finding=LDAP_DEREF_FINDING,
             ^~~~~~~~~~~~~~~~~~
             APR_LDAP_DEREF_FINDING
/usr/src/apache/httpd-trunk/include/util_ldap.h:97:12: error: ‘LDAP_DEREF_ALWAYS’ undeclared here (not in a function); did you
mean ‘APR_LDAP_DEREF_ALWAYS’?
     always=LDAP_DEREF_ALWAYS
            ^~~~~~~~~~~~~~~~~
            APR_LDAP_DEREF_ALWAYS
/usr/src/apache/httpd-trunk/include/util_ldap.h:102:5: error: unknown type name ‘LDAP’
     LDAP *ldap;
     ^~~~
make[2]: *** [/usr/src/apache/httpd-trunk/build/rules.mk:207: exports.lo] Error 1
make[1]: *** [/usr/src/apache/httpd-trunk/build/rules.mk:75: install-recursive] Error 1
make: *** [/usr/src/apache/httpd-trunk/build/rules.mk:75: install-recursive] Error 1


Regards

Rüdiger