Make sure that if auth_ldap is loaded, mod_ldap is also loaded

Reviewed by: bnicholes, minfrin, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103372 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 48b65a96ef41036e2e149d060b7022f90f3cb1eb..64c5133c5e4814d0ee5744c8076aa4fbd7869298 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/04/12 21:17:42 $]
+Last modified at [$Date: 2004/04/12 21:26:25 $]
 
 Release:
 
@@ -139,11 +139,6 @@ PATCHES TO BACKPORT FROM 2.1
          modules/mappers/mod_rewrite.c: r1.255
        +1: nd
 
-    *) Check to make sure that if auth_ldap is loaded, mod_ldap is 
-       also loaded. 
-         modules/experimental/mod_auth_ldap.c: r1.22
-       +1: bnicholes, minfrin, trawick
-       
     *) Update the ldc->binddn and ldc->bindpw associated with the LDAP 
        connection to match the authenticating user DN and password after
        ldap_simple_bind_s() is called to authenticate the user.  Otherwise 

diff --git a/modules/experimental/mod_auth_ldap.c b/modules/experimental/mod_auth_ldap.c
index f2b5e3b4c545d49e1aec98708f2555f677b2e516..2ac9305d50d65577241d8882c668c058e1ff8ae7 100644 (file)
--- a/modules/experimental/mod_auth_ldap.c
+++ b/modules/experimental/mod_auth_ldap.c
@@ -953,6 +953,15 @@ static int auth_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pt
     }
     */
 
+    /* make sure that mod_ldap (util_ldap) is loaded */
+    if (ap_find_linked_module("util_ldap.c") == NULL) {
+        ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
+                     "Module mod_ldap missing. Mod_ldap (aka. util_ldap) "
+                     "must be loaded in order for mod_auth_ldap to function properly");
+        return HTTP_INTERNAL_SERVER_ERROR;
+
+    }
+
     if (!charset_confname) {
         return OK;
     }