httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: httpd-ldap/ldap-cache util_ldap.c
Date Sat, 18 May 2002 05:11:10 GMT
jwoolley    02/05/17 22:11:10

  Modified:    ldap-aaa mod_auth_ldap.c
               ldap-cache util_ldap.c
  Log:
  Fail in a more sensible way when APR-util is missing its LDAP support
  
  Revision  Changes    Path
  1.3       +4 -0      httpd-ldap/ldap-aaa/mod_auth_ldap.c
  
  Index: mod_auth_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-ldap/ldap-aaa/mod_auth_ldap.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -d -u -r1.2 -r1.3
  --- mod_auth_ldap.c	8 Feb 2002 18:29:17 -0000	1.2
  +++ mod_auth_ldap.c	18 May 2002 05:11:10 -0000	1.3
  @@ -78,6 +78,10 @@
   #include "http_request.h"
   #include "util_ldap.h"
   
  +#ifndef APU_HAS_LDAP
  +#error mod_auth_ldap requires APR-util to have LDAP support built in
  +#endif
  +
   /* per directory configuration */
   typedef struct {
       apr_pool_t *pool;			/* Pool that this config is allocated from */
  
  
  
  1.3       +4 -5      httpd-ldap/ldap-cache/util_ldap.c
  
  Index: util_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-ldap/ldap-cache/util_ldap.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -d -u -r1.2 -r1.3
  --- util_ldap.c	8 Feb 2002 18:29:17 -0000	1.2
  +++ util_ldap.c	18 May 2002 05:11:10 -0000	1.3
  @@ -61,9 +61,6 @@
    */
   
   #include <apr_ldap.h>
  -
  -#ifdef APU_HAS_LDAP
  -
   #include <apr_strings.h>
   
   #include "ap_config.h"
  @@ -80,6 +77,10 @@
   #include <unistd.h>
   #endif
   
  +#ifndef APU_HAS_LDAP
  +#error mod_ldap requires APR-util to have LDAP support built in
  +#endif
  +
   module AP_MODULE_DECLARE_DATA ldap_module;
   
   int util_ldap_handler(request_rec *r);
  @@ -905,8 +906,6 @@
       ldc->reason = "Authentication successful";
       return LDAP_SUCCESS;
   }
  -
  -#endif /* APU_HAS_LDAP */
   
   
   
  
  
  

Mime
View raw message