| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Thu, 16 May 2013 01:31:13 -0700 | |
| branch | s11-update |
| changeset 2623 | 948dde330876 |
| child 1400 | 4e54fb56a064 |
| permissions | -rw-r--r-- |
|
2623
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
--- modules/aaa/config.m4 Mon Jun 9 09:04:46 2008 |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
+++ modules/aaa/config.m4 Thu Nov 10 07:04:40 2011 |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
@@ -35,7 +35,7 @@ |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
dnl LDAP authentication module. This module has both the authn and authz |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
dnl modules in one, so as to share the LDAP server config directives. |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
APACHE_MODULE(authnz_ldap, LDAP based authentication, , , no, [ |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
- MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_AUTHNZ_LDAP_LDADD="" |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
+ MOD_AUTHNZ_LDAP_LDADD="-lldap_r-2.4 -llber" |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
AC_SUBST(MOD_AUTHNZ_LDAP_LDADD) |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
]) |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
|
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
--- modules/ldap/config.m4 Mon Jun 9 09:04:46 2008 |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+++ modules/ldap/config.m4 Thu Nov 10 07:02:52 2011 |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
@@ -5,7 +5,7 @@ |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
|
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo" |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no, [ |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
- MOD_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_LDAP_LDADD="" |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ MOD_LDAP_LDADD="-lldap_r-2.4 -llber" |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
AC_SUBST(MOD_LDAP_LDADD) |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
]) |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
|
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
--- configure.in Sat Apr 16 12:09:47 2011 |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+++ configure.in Thu Nov 10 07:18:54 2011 |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
@@ -144,7 +144,7 @@ |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
|
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
APR_ADDTO(LDFLAGS, `$apu_config --ldflags`) |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
APU_BINDIR=`$apu_config --bindir` |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
-APU_INCLUDEDIR=`$apu_config --includedir` |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
+APU_INCLUDEDIR="`$apu_config --includedir` -I/usr/include/openldap" |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
APU_VERSION=`$apu_config --version` |
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
|
|
948dde330876
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |