From: David Goulet <dgoulet@torproject.org>
Date: Thu, 14 Oct 2021 13:56:10 +0000 (-0400)
Subject: hs: Improve warning for bad service version
X-Git-Tag: tor-0.4.6.8~11^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db297a177edc8aba9334d6b3b525604d9b0f87a2;p=thirdparty%2Ftor.git

hs: Improve warning for bad service version

Now that we don't have version 2, it gives us:

  [warn] HiddenServiceVersion must be between 3 and 3, not 2.

This commit changes it to:

  [warn] HiddenServiceVersion must be 3, not 2.

Part of #40476

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c
index 7ffc7ecb96..f8d71674de 100644
--- a/src/feature/hs/hs_config.c
+++ b/src/feature/hs/hs_config.c
@@ -179,8 +179,12 @@ static bool
 check_value_oob(int i, const char *name, int low, int high)
 {
   if (i < low || i > high) {
-    log_warn(LD_CONFIG, "%s must be between %d and %d, not %d.",
-             name, low, high, i);
+    if (low == high) {
+      log_warn(LD_CONFIG, "%s must be %d, not %d.", name, low, i);
+    } else {
+      log_warn(LD_CONFIG, "%s must be between %d and %d, not %d.",
+               name, low, high, i);
+    }
     return true;
   }
   return false;