httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental mod_auth_ldap.c
Date Mon, 12 Apr 2004 21:26:26 GMT
bnicholes    2004/04/12 14:26:26

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS
               modules/experimental Tag: APACHE_2_0_BRANCH mod_auth_ldap.c
  Log:
  Make sure that if auth_ldap is loaded, mod_ldap is also loaded
  
  Reviewed by: bnicholes, minfrin, trawick
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.814 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.813
  retrieving revision 1.751.2.814
  diff -u -r1.751.2.813 -r1.751.2.814
  --- STATUS	12 Apr 2004 21:17:42 -0000	1.751.2.813
  +++ STATUS	12 Apr 2004 21:26:25 -0000	1.751.2.814
  @@ -139,11 +139,6 @@
            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 
  
  
  
  No                   revision
  No                   revision
  1.8.2.12  +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.8.2.11
  retrieving revision 1.8.2.12
  diff -u -r1.8.2.11 -r1.8.2.12
  --- mod_auth_ldap.c	9 Feb 2004 20:53:16 -0000	1.8.2.11
  +++ mod_auth_ldap.c	12 Apr 2004 21:26:26 -0000	1.8.2.12
  @@ -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;
       }
  
  
  

Mime
View raw message