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/ldap util_ldap.c
Date Thu, 26 Aug 2004 15:24:51 GMT
bnicholes    2004/08/26 08:24:51

  Modified:    modules/ldap util_ldap.c
  Log:
  Preserve the return value from the apr_stat() call so that it can be displayed in the error
log message.
  
  Revision  Changes    Path
  1.10      +4 -3      httpd-2.0/modules/ldap/util_ldap.c
  
  Index: util_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ldap/util_ldap.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- util_ldap.c	23 Aug 2004 23:25:12 -0000	1.9
  +++ util_ldap.c	26 Aug 2004 15:24:51 -0000	1.10
  @@ -1045,6 +1045,7 @@
   						  &ldap_module);
       const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
       apr_finfo_t finfo;
  +    apr_status_t rv;
   
       if (err != NULL) {
           return err;
  @@ -1057,11 +1058,11 @@
       st->cert_auth_file = ap_server_root_relative(cmd->pool, file);
   
       if (st->cert_auth_file && 
  -        (apr_stat (&finfo, st->cert_auth_file, APR_FINFO_MIN, cmd->pool) != APR_SUCCESS))
  +        ((rv = apr_stat (&finfo, st->cert_auth_file, APR_FINFO_MIN, cmd->pool))
!= APR_SUCCESS))
       {
           ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server, 
  -                     "LDAP: Could not open SSL trusted certificate authority file - %s",

  -                     st->cert_auth_file == NULL ? file : st->cert_auth_file);
  +                     "LDAP: Could not open SSL trusted certificate authority file - %s
error: %d", 
  +                     st->cert_auth_file == NULL ? file : st->cert_auth_file, rv);
           return "Invalid file path";
       }
   
  
  
  

Mime
View raw message