OpenVPN/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2025-05-09 05:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing spaces in various messages

Browse Source 
These result from broken up literals where it
is easy to miss the missing space.

Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20240722121034.10816-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28950.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Frank Lichtenheld 2024-07-22 14:10:34 +02:00 committed by Gert Doering
parent 37b696a207
commit 824fe9ce49
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openvpn/dco.c
View File

@ -185,7 +185,7 @@ dco_update_keys(dco_context_t *dco, struct tls_multi *multi)
} }
else else
{ {
msg(D_DCO_DEBUG, "Swapping primary and secondary keys to" msg(D_DCO_DEBUG, "Swapping primary and secondary keys to "
"primary-id=%d secondary-id=(to be deleted)", "primary-id=%d secondary-id=(to be deleted)",
primary->key_id); primary->key_id);
} }

12
src/openvpn/multi.c
View File

@ -1804,7 +1804,7 @@ multi_client_set_protocol_options(struct context *c)
} }
else if (dco_enabled(o)) else if (dco_enabled(o))
{ {
msg(M_INFO, "Client does not support DATA_V2. Data channel offloaing " msg(M_INFO, "Client does not support DATA_V2. Data channel offloading "
"requires DATA_V2. Dropping client."); "requires DATA_V2. Dropping client.");
auth_set_client_reason(tls_multi, "Data channel negotiation " auth_set_client_reason(tls_multi, "Data channel negotiation "
"failed (missing DATA_V2)"); "failed (missing DATA_V2)");
@ -1815,7 +1815,7 @@ multi_client_set_protocol_options(struct context *c)
* not accept our pushed ciphers */ * not accept our pushed ciphers */
if (proto & IV_PROTO_NCP_P2P) 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 server. " "option). It will not negotiate ciphers with this server. "
"Expect this connection to fail."); "Expect this connection to fail.");
} }
@ -2027,7 +2027,7 @@ ccs_test_deferred_ret_file(struct multi_instance *mi)
/* Not EOF but other error -> fall through to error state */ /* Not EOF but other error -> fall through to error state */
default: default:
/* We received an unknown/unexpected value. Assume failure. */ /* 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"); "client-connect resultfile");
ret = CC_RET_FAILED; ret = CC_RET_FAILED;
} }
@ -2427,7 +2427,7 @@ multi_client_connect_late_setup(struct multi_context *m,
*/ */
if (!mi->context.c2.push_ifconfig_defined) 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", "--ifconfig address is available for %s",
multi_instance_string(mi, false, &gc)); multi_instance_string(mi, false, &gc));
} }
@ -2443,7 +2443,7 @@ multi_client_connect_late_setup(struct multi_context *m,
print_in_addr_t(mi->context.options.push_ifconfig_constraint_netmask, 0, &gc); print_in_addr_t(mi->context.options.push_ifconfig_constraint_netmask, 0, &gc);
/* JYFIXME -- this should cause the connection to fail */ /* 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)", "violates tunnel network/netmask constraint (%s/%s)",
multi_instance_string(mi, false, &gc), multi_instance_string(mi, false, &gc),
print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc), print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc),
@ -2492,7 +2492,7 @@ multi_client_connect_late_setup(struct multi_context *m,
} }
else if (mi->context.options.iroutes) else if (mi->context.options.iroutes)
{ {
msg(D_MULTI_ERRORS, "MULTI: --iroute options rejected for %s -- iroute" msg(D_MULTI_ERRORS, "MULTI: --iroute options rejected for %s -- iroute "
"only works with tun-style tunnels", "only works with tun-style tunnels",
multi_instance_string(mi, false, &gc)); multi_instance_string(mi, false, &gc));
} }

4
src/openvpn/options.c
View File

@ -7033,7 +7033,7 @@ add_option(struct options *options,
} }
else if (streq(p[0], "max-routes") && !p[2]) 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. " "The number of routes is unlimited as of OpenVPN 2.4. "
"This option will be removed in a future version, " "This option will be removed in a future version, "
"please remove it from your configuration."); "please remove it from your configuration.");
@ -9328,7 +9328,7 @@ add_option(struct options *options,
s++; s++;
} }
msg(M_WARN, "DEPRECATED FEATURE: automatically upcased the " msg(M_WARN, "DEPRECATED FEATURE: automatically upcased the "
"--x509-username-field parameter to '%s'; please update your" "--x509-username-field parameter to '%s'; please update your "
"configuration", p[j]); "configuration", p[j]);
} }
} }

2
src/openvpn/ssl_verify.c
View File

@ -717,7 +717,7 @@ verify_cert(struct tls_session *session, openvpn_x509_cert_t *cert, int cert_dep
{ {
const char *hex_fp = format_hex_ex(BPTR(&cert_fp), BLEN(&cert_fp), const char *hex_fp = format_hex_ex(BPTR(&cert_fp), BLEN(&cert_fp),
0, 1, ":", &gc); 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 " "certificate hash verification failed. (got certificate "
"fingerprint: %s)", hex_fp); "fingerprint: %s)", hex_fp);
goto cleanup; goto cleanup;