httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.c
Date Thu, 23 Aug 2001 23:43:45 GMT
dougm       01/08/23 16:43:45

  Modified:    modules/ssl mod_ssl.c
  Log:
  prevent double lookup of ssl::verify::error
  
  Revision  Changes    Path
  1.26      +5 -4      httpd-2.0/modules/ssl/mod_ssl.c
  
  Index: mod_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_ssl.c	2001/08/23 00:06:27	1.25
  +++ mod_ssl.c	2001/08/23 23:43:45	1.26
  @@ -342,7 +342,7 @@
   {
       int n, err;
       X509 *xs;
  -    char *cp;
  +    char *cp = NULL;
       conn_rec *c = (conn_rec*)SSL_get_app_data (pRec->pssl);
       SSLSrvConfigRec *sc = mySrvConfig(c->base_server);
   
  @@ -445,9 +445,10 @@
           /*
            * Check for failed client authentication
            */
  -        if (   SSL_get_verify_result(pRec->pssl) != X509_V_OK
  -            || apr_table_get (c->notes, "ssl::verify::error") != NULL) {
  -            cp = (char *)apr_table_get(c->notes, "ssl::verify::error");
  +        if (SSL_get_verify_result(pRec->pssl) != X509_V_OK ||
  +            ((cp = (char *)apr_table_get(c->notes,
  +                                         "ssl::verify::error")) != NULL))
  +        {
               ssl_log(c->base_server, SSL_LOG_ERROR|SSL_ADD_SSLERR,
                       "SSL client authentication failed: %s",
                       cp != NULL ? cp : "unknown reason");
  
  
  

Mime
View raw message