From cvs-return-18710-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org Tue Apr 06 15:13:15 2004 Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 95705 invoked from network); 6 Apr 2004 15:13:15 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 6 Apr 2004 15:13:15 -0000 Received: (qmail 97024 invoked by uid 500); 6 Apr 2004 15:12:23 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 96981 invoked by uid 500); 6 Apr 2004 15:12:22 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 96967 invoked by uid 500); 6 Apr 2004 15:12:22 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 96958 invoked from network); 6 Apr 2004 15:12:22 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 6 Apr 2004 15:12:22 -0000 Received: (qmail 94852 invoked by uid 1285); 6 Apr 2004 15:12:27 -0000 Date: 6 Apr 2004 15:12:27 -0000 Message-ID: <20040406151227.94851.qmail@minotaur.apache.org> From: bnicholes@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/experimental mod_auth_ldap.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bnicholes 2004/04/06 08:12:27 Modified: modules/experimental mod_auth_ldap.c Log: Make sure that if auth_ldap is loaded, mod_ldap is also loaded Revision Changes Path 1.22 +9 -0 httpd-2.0/modules/experimental/mod_auth_ldap.c Index: mod_auth_ldap.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_auth_ldap.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_auth_ldap.c 9 Feb 2004 20:29:18 -0000 1.21 +++ mod_auth_ldap.c 6 Apr 2004 15:12:27 -0000 1.22 @@ -953,6 +953,15 @@ } */ + /* 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; }