From patchwork Mon Jul 22 12:10:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3773 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6242:b0:5a1:d4fc:4ac6 with SMTP id v2csp1885095mad; Mon, 22 Jul 2024 05:11:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXZLyL+/7zFo1BxUZEMzNio8AtrOO0NuNs204EziRHo0lL3yFj1iF7SXsuxd0Fzgvs2YDQRqvlTqer9WicEYyUzUYQlUd4= X-Google-Smtp-Source: AGHT+IGXK4kLVFDwZc8KlLyKQGckucVK56WiOU7OaBQ5JtgxLOsVw/GjmPmPlQfLkxC3fu+3NG5D X-Received: by 2002:a05:6a00:860d:b0:70d:25f1:c086 with SMTP id d2e1a72fcca58-70d25f1c157mr2117338b3a.0.1721650283190; Mon, 22 Jul 2024 05:11:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721650283; cv=none; d=google.com; s=arc-20160816; b=DIFWG0HLNchvIWoafgfUfOtW+bmit+HTNdO6cCQgDOh+Hef1cMHWVfnrmpQ8Dy6LoG iAKoAT14yOdu1Rt58z+KM0nAtZQq5ua7MZXqRW9XeqApas/pPk/IAIJDB5FYagVNH/Pm b6G7HoN2qY0MMIYq4LF62bjnQ7LLo2b7f6HzKTD7KTFcH/VFigL8af+7GqNw52ocNZaN GLNmDUtuPR7Gj0/SipVqDDkzV07tGnqO0gWhKuUtRzwyyfd5xNvnV50y4BUMN9UKda9c vEq8UNE4IgboZGwlh0fRJxk/ZbqZkE46Kv6WPu+1EkjHd5Bbks40C+Lo/UyRih37kpqR PJXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=LcvJ474krb+waHdBGZCRztnmQz0P87xb4FF/+hzJzSI=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=ACgfGTehufa5r2Z4LdBDfru2Z3oB3NuuJMn7VjaclcDEN+guqySj1lBatIQhvwTdHe 2utsmZH45fKc1Ov68UU+DQmCqb7bYtyuSaMo/g0UyL3tPA5V5ztHg09U+tDLv8pBn35H gbXGg/a6nJ5V0vuNaXZdlqMdd7HtLBwMyjpYDJkBbvdK3JVrpYQ6BM8t3NKF/CqOdK/I Ivoevk6R1eM6nAwNMPc1rqr+9do31t5HOiM3tnqEPCN95JI/sRUFYALqXKxdwcEQLbN0 GUrAwLK00Cb05CMeMx6UQzeJFGwfu2/s0J7iFRZk2YXeHlXbaKGDuFzJFWcb3jeJiwz0 /tTQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="S2uqE/nm"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="FBJwtc/3"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 41be03b00d2f7-79f0a6bdc44si6316224a12.123.2024.07.22.05.11.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jul 2024 05:11:23 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="S2uqE/nm"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="FBJwtc/3"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1sVrsT-0002pa-1A; Mon, 22 Jul 2024 12:10:53 +0000 Received: from [172.30.29.67] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1sVrsQ-0002pD-MW for openvpn-devel@lists.sourceforge.net; Mon, 22 Jul 2024 12:10:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4oFZqVDz7DkGv4IorhztXMsADiWSTdI1p49UM4kzp4o=; b=S2uqE/nmxTE247e9bDoG3cxeo1 CXQmvzyXNCaJX3Fjz5qBGj3LJxcYohAl7BNFaLPY2IkQXXnHs8/KLi0V5vbPjXBAqimglsCRT1aDQ qiGpJ/Dj7W0v5kifsdUeFAK1gWT5Bb6C3FgMNDFv7W/9VKhcdFZyII7GP8lFOMLrAZdM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=4oFZqVDz7DkGv4IorhztXMsADiWSTdI1p49UM4kzp4o=; b=FBJwtc/3LsjBwxTDYwcNAJppkn srolYpu4ICtPIfoFLG/v9zFf8zNm71Eg4jddQpxRFsF/OTs4rGKk5d6oYg93H7ko4CxXRwB8YT12a PoT6OGqLBmZUSAdqxXH06lX/BMOuycnFSZd7UcNDkasP6Vm+pJJQmppW7/NjWVXOJJCE=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1sVrsO-0002OF-Gu for openvpn-devel@lists.sourceforge.net; Mon, 22 Jul 2024 12:10:50 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 46MCAaAw010826 for ; Mon, 22 Jul 2024 14:10:36 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 46MCAawr010825 for openvpn-devel@lists.sourceforge.net; Mon, 22 Jul 2024 14:10:36 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 22 Jul 2024 14:10:34 +0200 Message-ID: <20240722121034.10816-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.44.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -5.0 (-----) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Frank Lichtenheld 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 --- Content analysis details: (-5.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: openvpn.net] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in sa-accredit.habeas.com] -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [193.149.48.174 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Headers-End: 1sVrsO-0002OF-Gu Subject: [Openvpn-devel] [PATCH v1] Fix missing spaces in various messages X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1805281167537312705?= X-GMAIL-MSGID: =?utf-8?q?1805281167537312705?= From: Frank Lichtenheld 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 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/679 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering 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=%d secondary-id=(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 offloaing " + msg(M_INFO, "Client does not support DATA_V2. Data channel offloading " "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/--client" + msg(M_WARN, "Note: peer reports running in P2P mode (no --pull/--client " "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 = 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_netmask, 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 -- iroute" + msg(D_MULTI_ERRORS, "MULTI: --iroute options rejected for %s -- iroute " "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 update your" + "--x509-username-field parameter to '%s'; please update 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 = format_hex_ex(BPTR(&cert_fp), BLEN(&cert_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;