From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 22 May 2014 15:51:27 +0000 (+0300)
Subject: Fix atstep ACL values to match SslPeekAndSplice wiki page
X-Git-Tag: SQUID_3_5_0_1~89^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1993295b83f6c789e819c052fe707ded3f5d9da9;p=thirdparty%2Fsquid.git

Fix atstep ACL values to match SslPeekAndSplice wiki page

Change the possible atstep ACL values from step1, step2, step3 to  SslBump1,
SslBump2, SslBump3 to match SslPeekAndSplice wiki page description.
---

diff --git a/src/acl/AtBumpStepData.cc b/src/acl/AtBumpStepData.cc
index 4aadb3299f..91c01bf850 100644
--- a/src/acl/AtBumpStepData.cc
+++ b/src/acl/AtBumpStepData.cc
@@ -32,9 +32,9 @@ ACLAtStepData::dump() const
 {
     SBufList sl;
     for (std::list<Ssl::BumpStep>::const_iterator it = values.begin(); it != values.end(); ++it) {
-        sl.push_back(SBuf(*it == Ssl::bumpStep1 ? "step1" : 
-                          *it == Ssl::bumpStep2 ? "step2" : 
-                          *it == Ssl::bumpStep3 ? "step3" : "???"));
+        sl.push_back(SBuf(*it == Ssl::bumpStep1 ? "SslBump1" : 
+                          *it == Ssl::bumpStep2 ? "SslBump2" : 
+                          *it == Ssl::bumpStep3 ? "SslBump3" : "???"));
     }
     return sl;
 }
@@ -43,11 +43,11 @@ void
 ACLAtStepData::parse()
 {
     while (const char *t = strtokFile()) {
-        if (strcasecmp(t, "step1") == 0) {
+        if (strcasecmp(t, "SslBump1") == 0) {
             values.push_back(Ssl::bumpStep1);
-        } else if (strcasecmp(t, "step2") == 0) {
+        } else if (strcasecmp(t, "SslBump2") == 0) {
             values.push_back(Ssl::bumpStep2);
-        } else if (strcasecmp(t, "step3") == 0) {
+        } else if (strcasecmp(t, "SslBump3") == 0) {
             values.push_back(Ssl::bumpStep3);
         } else {
             debugs(28, DBG_CRITICAL, "FATAL: invalid AtStep step: " << t);
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 09bca5a70b..67b3726d3e 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1151,9 +1151,9 @@ IF USE_OPENSSL
 
 	acl aclname atstep step
 	  # match against SSL bumping step. Valid SSL bumping step values:
-	  # step1: Get TCP-level and CONNECT info.
-	  # step2: Get SSL Client Hello info.
-	  # step3: Get SSL Server Hello info.
+	  # SslBump1: Get TCP-level and CONNECT info.
+	  # SslBump2: Get SSL Client Hello info.
+	  # SslBump3: Get SSL Server Hello info.
 ENDIF
 	acl aclname any-of acl1 acl2 ...
 	  # match any one of the acls [fast or slow]