From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 22 Aug 2023 06:49:49 +0000 (+0900)
Subject: network: fix log message and man page for HopLimit=
X-Git-Tag: v255-rc1~674
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08801318e8bf8383d5186bd77972feb6332225c1;p=thirdparty%2Fsystemd.git

network: fix log message and man page for HopLimit=

Follow-up for 88c0642358398240a54d242e812439fcd0564b05.
Closes #28899.
---

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index da4282e5020..47b7d7b1d1f 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1620,7 +1620,8 @@ allow my_server_t localnet_peer_t:peer recv;</programlisting>
       <varlistentry>
         <term><varname>HopLimit=</varname></term>
         <listitem>
-          <para> Configures per route hop limit. See also <varname>IPv6HopLimit=</varname>.</para>
+          <para>Configures per route hop limit. Takes an integer in the range 1…255. See also
+          <varname>IPv6HopLimit=</varname>.</para>
         </listitem>
       </varlistentry>
 
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 7af697c16d2..99c9a135395 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -2573,17 +2573,17 @@ int config_parse_route_hop_limit(
         r = safe_atou32(rvalue, &k);
         if (r < 0) {
                 log_syntax(unit, LOG_WARNING, filename, line, r,
-                           "Could not parse route hop limit %s \"%s\", ignoring assignment: %m", lvalue, rvalue);
+                           "Could not parse per route hop limit, ignoring assignment: %s", rvalue);
                 return 0;
         }
         if (k > 255) {
                 log_syntax(unit, LOG_WARNING, filename, line, 0,
-                           "Specified route hop limit %s \"%s\" is too large, ignoring assignment: %m", lvalue, rvalue);
+                           "Specified per route hop limit \"%s\" is too large, ignoring assignment: %m", rvalue);
                 return 0;
         }
         if (k == 0) {
                 log_syntax(unit, LOG_WARNING, filename, line, 0,
-                           "Invalid route hop limit %s \"%s\", ignoring assignment: %m", lvalue, rvalue);
+                           "Invalid per route hop limit \"%s\", ignoring assignment: %m", rvalue);
                 return 0;
         }