From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 11 Dec 2020 12:59:57 +0000 (+0100)
Subject: Fix tls-auth mismatch OCC message when tls-cryptv2 is used.
X-Git-Tag: v2.5.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1bcf8a4bf3986a25f3906abe213fc9cd171ea04;p=thirdparty%2Fopenvpn.git

Fix tls-auth mismatch OCC message when tls-cryptv2 is used.

A server with tls-cryptv2 and tls-auth produces the warning:

  WARNING: 'tls-auth' is present in local config but missing in remote
config, local='tls-auth'"

The tls-auth option has no argument so the strpefix with the space
included does not match it.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Steffan Karger <steffan@karger.me>
Message-Id: <20201211125957.7764-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21358.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 15daa9886b64a8378a6c5d68f79076dc44095696)
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index dbbc4fcee..866eef5d0 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3964,7 +3964,7 @@ options_warning_safe_scan2(const int msglevel,
     if (strprefix(p1, "key-method ")
         || strprefix(p1, "keydir ")
         || strprefix(p1, "proto ")
-        || strprefix(p1, "tls-auth ")
+        || streq(p1, "tls-auth")
         || strprefix(p1, "tun-ipv6")
         || strprefix(p1, "cipher "))
     {