Summary: SSL Support for recent changes.

Keywords:

The ConnStateData change broke SSL, which wasn't enabled in my build tree.

diff --git a/src/client_side.cc b/src/client_side.cc
index 8da63f853cb5d92e3827f20917ca42ab9e20df4d..c1cd8c3aff8146fcf69432cef4a5dcd3586d31b3 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.649 2003/07/11 02:11:47 robertc Exp $
+ * $Id: client_side.cc,v 1.650 2003/07/13 23:00:09 robertc Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -523,7 +523,7 @@ ClientHttpRequest::logRequest()
 
 #if USE_SSL
 
-        if (getConn())
+        if (getConn().getRaw() != NULL)
             al.cache.ssluser = sslGetUserEmail(fd_table[getConn()->fd].ssl);
 
 #endif

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 25640aad556d20aebdda450c0e2203362d206b72..662a9af1ba1ab57e6d14149d3291cc4b8bb07b83 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.49 2003/07/11 01:40:36 robertc Exp $
+ * $Id: external_acl.cc,v 1.50 2003/07/13 23:00:09 robertc Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -768,7 +768,7 @@ makeExternalAclKey(ACLChecklist * ch, external_acl_data * acl_data)
 
         case _external_acl_format::EXT_ACL_USER_CERT:
 
-            if (cbdataReferenceValid(ch->conn())) {
+            if (ch->conn().getRaw()) {
                 SSL *ssl = fd_table[ch->conn()->fd].ssl;
 
                 if (ssl)
@@ -779,7 +779,7 @@ makeExternalAclKey(ACLChecklist * ch, external_acl_data * acl_data)
 
         case _external_acl_format::EXT_ACL_CA_CERT:
 
-            if (cbdataReferenceValid(ch->conn())) {
+            if (ch->conn().getRaw()) {
                 SSL *ssl = fd_table[ch->conn()->fd].ssl;
 
                 if (ssl)