From: "cron2 (Code Review)" Date: Mon, 22 Jul 2024 13:20:30 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <3475d7b418c575460e4562604db71547267ccce0-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="bcnz526pwjM="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Fix missing spaces in various messages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --bcnz526pwjM= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/67= 9?usp=3Demail ) Change subject: Fix missing spaces in various messages ...................................................................... Fix missing spaces in various messages These result from broken up literals where it is easy to miss the missing space. Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20240722121034.10816-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 950.html Signed-off-by: Gert Doering --- M src/openvpn/dco.c M src/openvpn/multi.c M src/openvpn/options.c M src/openvpn/ssl_verify.c 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index 78243b1..7f0d53d 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -185,7 +185,7 @@ } else { - msg(D_DCO_DEBUG, "Swapping primary and secondary keys to" + msg(D_DCO_DEBUG, "Swapping primary and secondary keys to " "primary-id=3D%d secondary-id=3D(to be deleted)", primary->key_id); } diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 162b23e..03177bb 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1804,7 +1804,7 @@ } else if (dco_enabled(o)) { - msg(M_INFO, "Client does not support DATA_V2. Data channel offloai= ng " + msg(M_INFO, "Client does not support DATA_V2. Data channel offload= ing " "requires DATA_V2. Dropping client."); auth_set_client_reason(tls_multi, "Data channel negotiation " "failed (missing DATA_V2)"); @@ -1815,7 +1815,7 @@ * not accept our pushed ciphers */ if (proto & IV_PROTO_NCP_P2P) { - msg(M_WARN, "Note: peer reports running in P2P mode (no --pull/--c= lient" + msg(M_WARN, "Note: peer reports running in P2P mode (no --pull/--c= lient " "option). It will not negotiate ciphers with this server. " "Expect this connection to fail."); } @@ -2027,7 +2027,7 @@ /* Not EOF but other error -> fall through to error state */ default: /* We received an unknown/unexpected value. Assume failure. */ - msg(M_WARN, "WARNING: Unknown/unexpected value in deferred" + msg(M_WARN, "WARNING: Unknown/unexpected value in deferred " "client-connect resultfile"); ret =3D CC_RET_FAILED; } @@ -2427,7 +2427,7 @@ */ if (!mi->context.c2.push_ifconfig_defined) { - msg(D_MULTI_ERRORS, "MULTI: no dynamic or static remote" + msg(D_MULTI_ERRORS, "MULTI: no dynamic or static remote " "--ifconfig address is available for %s", multi_instance_string(mi, false, &gc)); } @@ -2443,7 +2443,7 @@ print_in_addr_t(mi->context.options.push_ifconfig_constraint_n= etmask, 0, &gc); /* JYFIXME -- this should cause the connection to fail */ - msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s)" + msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s) " "violates tunnel network/netmask constraint (%s/%s)", multi_instance_string(mi, false, &gc), print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc), @@ -2492,7 +2492,7 @@ } else if (mi->context.options.iroutes) { - msg(D_MULTI_ERRORS, "MULTI: --iroute options rejected for %s -- ir= oute" + msg(D_MULTI_ERRORS, "MULTI: --iroute options rejected for %s -- ir= oute " "only works with tun-style tunnels", multi_instance_string(mi, false, &gc)); } diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 64e67aa..ba9b05e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7033,7 +7033,7 @@ } else if (streq(p[0], "max-routes") && !p[2]) { - msg(M_WARN, "DEPRECATED OPTION: --max-routes option ignored." + msg(M_WARN, "DEPRECATED OPTION: --max-routes option ignored. " "The number of routes is unlimited as of OpenVPN 2.4. " "This option will be removed in a future version, " "please remove it from your configuration."); @@ -9328,7 +9328,7 @@ s++; } msg(M_WARN, "DEPRECATED FEATURE: automatically upcased= the " - "--x509-username-field parameter to '%s'; please u= pdate your" + "--x509-username-field parameter to '%s'; please u= pdate your " "configuration", p[j]); } } diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index 934ff8d..0b0e2c3 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -717,7 +717,7 @@ { const char *hex_fp =3D format_hex_ex(BPTR(&cert_fp), BLEN(&cer= t_fp), 0, 1, ":", &gc); - msg(D_TLS_ERRORS, "TLS Error: --tls-verify/--peer-fingerprint" + msg(D_TLS_ERRORS, "TLS Error: --tls-verify/--peer-fingerprint " "certificate hash verification failed. (got certificate " "fingerprint: %s)", hex_fp); goto cleanup; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/679?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21 Gerrit-Change-Number: 679 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --bcnz526pwjM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

Fix missing spaces in various messages

= These result from broken up literals where it
is easy to miss the missin= g space.

Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21
Sig= ned-off-by: Frank Lichtenheld <frank@...2641...>
Acked-by: Gert Do= ering <gert@...1296...>
Message-Id: <20240722121034.10816-1-ger= t@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@...1096...= ourceforge.net/msg28950.html
Signed-off-by: Gert Doering <gert@...1826...= 6...>
---
M src/openvpn/dco.c
M src/openvpn/multi.c
M src/op= envpn/options.c
M src/openvpn/ssl_verify.c
4 files changed, 10 insert= ions(+), 10 deletions(-)

diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c
index= 78243b1..7f0d53d 100644
--- a/src/openvpn/dco.c
= +++ b/src/openvpn/dco.c
@@ -185,7 +185,7 @@ }
else
{<= /span>
- msg(D_DCO_= DEBUG, "Swapping primary and secondary keys to"
+ msg(D_DCO_DEBUG, "Sw= apping primary and secondary keys to "
= "primary-id=3D%d secondary-id=3D(to be deleted)",
primary->key_id);

}<= br>diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
<= span>index 162b23e..03177bb 100644
--- a/src/openvpn/multi.= c
+++ b/src/openvpn/multi.c
@@ -1804,7 +180= 4,7 @@
}
else if (dco_enabled(o))=
{
- msg(M_INFO, "Client does not support DATA_V2. Data channel o= ffloaing "
+ = msg(M_INFO, "Client does not support DATA_V2. Data channel offload= ing "
"requires DATA_V2. Dropping cl= ient.");
auth_set_client_reason(tls_multi, &q= uot;Data channel negotiation "
= "failed (missing DATA_V2)");
@@ -1815,7 = +1815,7 @@
* not accept our pushed ciphers */<= br> if (proto & IV_PROTO_NCP_P2P)
{
- msg(M_WARN, "= Note: peer reports running in P2P mode (no --pull/--client"
= + msg(M_WARN, "Note= : peer reports running in P2P mode (no --pull/--client "
"option). It will not negotiate ciphers with this serv= er. "

"Expect this connection to fai= l.");
}
@@ -2027,7 +2027,7 @@

/* Not EOF but other error -> fall through to erro= r state */
default:
/= * We received an unknown/unexpected value. Assume failure. */
- msg(M_WARN, "WARN= ING: Unknown/unexpected value in deferred"
+ msg(M_WARN, "WARNING: Unknown/= unexpected value in deferred "
"= client-connect resultfile");
ret =3D CC_R= ET_FAILED;
}
@@ -2427,7 +2427,7 @@
*/
if (!mi->context.c2.push_ifco= nfig_defined)
{
- msg(D_MULTI_ERRORS, "MULTI: no dynamic or stati= c remote"
+ = msg(D_MULTI_ERRORS, "MULTI: no dynamic or static remote "
"--ifconfig address is available for %s"= ,
multi_instance_string(mi, false, &gc));<= /span>
}
@@ -2443,7 +2443,7 @@
print_in_addr_t(mi->context.options.push_ifconfig_constra= int_netmask, 0, &gc);


/* JYF= IXME -- this should cause the connection to fail */
- msg(D_MULTI_ERRORS, "MULTI ERR= OR: primary virtual IP for %s (%s)"
+ msg(D_MULTI_ERRORS, "MULTI ERROR: primary= virtual IP for %s (%s) "
"violates = tunnel network/netmask constraint (%s/%s)",
= multi_instance_string(mi, false, &gc),
= print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc),<= br>@@ -2492,7 +2492,7 @@
}
= else if (mi->context.options.iroutes)
{
<= span style=3D"color: hsl(0, 100%, 40%);">- msg(D_MULTI_ERRORS, "= ;MULTI: --iroute options rejected for %s -- iroute"

+ msg(D_MULTI_ERRORS, "MULT= I: --iroute options rejected for %s -- iroute "
= "only works with tun-style tunnels",
= multi_instance_string(mi, false, &gc));
}<= /span>
diff --git a/src/openvpn/options.c b/src/openvpn/options.c<= /span>
index 64e67aa..ba9b05e 100644
--- a/src/ope= nvpn/options.c
+++ b/src/openvpn/options.c
= @@ -7033,7 +7033,7 @@
}
else if (= streq(p[0], "max-routes") && !p[2])
= {
- msg(M_WARN, = "DEPRECATED OPTION: --max-routes option ignored."
+ msg(M_WARN, "DEPRECATE= D OPTION: --max-routes option ignored. "

= "The number of routes is unlimited as of OpenVPN 2.4. " "This option will be removed in a future version, = "
"please remove it from your config= uration.");
@@ -9328,7 +9328,7 @@
= s++;
}
= msg(M_WARN, "DEPRECATED FEATURE: automatica= lly upcased the "
= - "--x509-username-field parameter to '%s&#= 39;; please update your"
+ "--x509-username-field parameter to = '%s'; please update your "
= "configuration", p[j]);
}<= /span>
}
diff --git a/src/openvpn/ssl= _verify.c b/src/openvpn/ssl_verify.c
index 934ff8d..0b0e2c3= 100644
--- a/src/openvpn/ssl_verify.c
+++ = b/src/openvpn/ssl_verify.c
@@ -717,7 +717,7 @@
{

const char *hex_fp =3D format_h= ex_ex(BPTR(&cert_fp), BLEN(&cert_fp),
= 0, 1, ":", &gc);- msg(D_TLS_ERRORS, &= quot;TLS Error: --tls-verify/--peer-fingerprint"
+ msg(D_TLS_ERRORS, "TLS E= rror: --tls-verify/--peer-fingerprint "
= "certificate hash verification failed. (got certificate "
"fingerprint: %s)", hex_fp);<= br> goto cleanup;

To = view, visit change 679. To unsubscribe, or for help writing mail filters, visit = settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic27d84c74c1dd6ff7973ca6966d= 186f475c67e21
Gerrit-Change-Number: 679
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--bcnz526pwjM=--