From patchwork Fri Aug 13 18:48:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 1912 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.27.255.55]) by backend30.mail.ord1d.rsapps.net with LMTP id OGTKKnBLF2FYMgAAIUCqbw (envelope-from ) for ; Sat, 14 Aug 2021 00:49:52 -0400 Received: from proxy1.mail.iad3a.rsapps.net ([172.27.255.55]) by director11.mail.ord1d.rsapps.net with LMTP id 0FKtKnBLF2GKVwAAvGGmqA (envelope-from ) for ; Sat, 14 Aug 2021 00:49:52 -0400 Received: from smtp9.gate.iad3a ([172.27.255.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3a.rsapps.net with LMTPS id MLTZI3BLF2GIMgAA8TVjwQ (envelope-from ) for ; Sat, 14 Aug 2021 00:49:52 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp9.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 0fb4f168-fcbb-11eb-aaa1-52540097fc8c-1-1 Received: from [216.105.38.7] ([216.105.38.7:42674] helo=lists.sourceforge.net) by smtp9.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id B0/9A-24346-07B47116; Sat, 14 Aug 2021 00:49:52 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1mElbF-0003Hc-8t; Sat, 14 Aug 2021 04:48:49 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mElbE-0003HW-CD for openvpn-devel@lists.sourceforge.net; Sat, 14 Aug 2021 04:48:48 +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:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PSnCYD8yoNzyXwAW5tIBDwTFiRreHrBc5hxMCf71R4o=; b=CMZuCsj8rdTHWRBMgfzTTrm9Fh dW/HRTbnjGmf2QIj12e71KlYWb1XpE45RNQku1rd7Pudm5U1KRyTVm8WjHpgpFJW+vfSt4mgr/tXz V9pa8kTDftVYqr5jwtKaJlxSX20L4YodAQELUB78odPJ1K+AnUaxL+kNVqAmRmt5XDM8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=PSnCYD8yoNzyXwAW5tIBDwTFiRreHrBc5hxMCf71R4o=; b=l ltx4suYAHWlwljjyKK5in9vDAPKrbBtrXO86ZD/FasliscICK+hutVIksW1cAbuJ2CQHn8c0UO2x+ gjDGOZuFYxXB++sZAff9FVt1qFwujzj0xW1TS9wMale/0aMRHj2L86UUe3wDjIzjweez51Y2Nre93 qwA4Itbi+0KRfyyo=; Received: from mail-qt1-f171.google.com ([209.85.160.171]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mElb9-005kpR-2h for openvpn-devel@lists.sourceforge.net; Sat, 14 Aug 2021 04:48:48 +0000 Received: by mail-qt1-f171.google.com with SMTP id e15so10060672qtx.1 for ; Fri, 13 Aug 2021 21:48:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PSnCYD8yoNzyXwAW5tIBDwTFiRreHrBc5hxMCf71R4o=; b=M07gbp6tY9MC81w3VVdQERgGU0xRsslFNvfItcD/KaeLUWhVSzXlOEKauREqfJzTiN lh8QrankAOjKcT9HEz4/2pPFy5ysa45FBGXX+NHeCd5Y/ls3IsdH5OGsFaAjr/CSUUWV 0oUkc0tc7nDjiFZ4alenJrIdLhLe0XcQMfPZAzsgfGQ0htXWzj+W9LHY3wQJ0fcBAJAv t1v3m7t0iyMYz+zthhwjLUfESeyZtXvSzzXmYQkdOk/RUa7jUWeeouWcF9BWUoCZadBE bP/vQsj5+dsHRlcIGmhrOI5f76ocnoUI3wFkea4fyCeJVsiN7hJ74Z87fGTUbFPwtY+8 ce4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PSnCYD8yoNzyXwAW5tIBDwTFiRreHrBc5hxMCf71R4o=; b=iopzI8mjfDbSrtmgB+c8ZPAFEYemL18CQLt3dgGHH8zvL6mtwkQwWOTclpsL9G7D7F eoZ50qqRPc1HdUFvgxSmN5QweWY5ogSXjZ0tlFBbT6SnRCRd+roKRavKU7JI1V2P1VCO aeAMqPZ/Cx6RGpVNcgE2HJMhJ0gYKLMs0Q83w4MLJ3XT+Td0kBaH3ojU9+/nmY+iT82b uaBkR5OjQLAG68EIKV0gUzBEbdGKyEsNAiliRVYkuNxKpYr3PVe3Qklr7YqOvS6I3zlr EWRe5acm6Z9hXs2WByQj/bTc3I/8mteEMEvC0M8C9y0O8sweSWv/6av1ZLlZILRXJJFt MRnw== X-Gm-Message-State: AOAM532+5w/m6B3LQ9qxe1nb+za6mzKMNs5SYNtuKjEIXU4nPlN8Z2pI 7fnTPTXukhj9MK5ueUCZMYKBvubF5UqHGQ== X-Google-Smtp-Source: ABdhPJwcBzXUym/DCvXqGIBIcjRO3JYpmo+UBxOHB1bUxjZaYuXHPYlpXlyzBL5yXPpjMO9AB8WQoA== X-Received: by 2002:ac8:7b47:: with SMTP id m7mr4822226qtu.178.1628916517156; Fri, 13 Aug 2021 21:48:37 -0700 (PDT) Received: from uranus.home.sansel.ca (bras-vprn-tnhlon4053w-lp130-02-70-51-223-174.dsl.bell.ca. [70.51.223.174]) by smtp.gmail.com with ESMTPSA id bm34sm2179465qkb.17.2021.08.13.21.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Aug 2021 21:48:36 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Sat, 14 Aug 2021 00:48:34 -0400 Message-Id: <20210814044834.2236-1-selva.nair@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (selva.nair[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.160.171 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.160.171 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1mElb9-005kpR-2h Subject: [Openvpn-devel] [PATCH] Fix client-pending-auth help message in management interface 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 From: Selva Nair - Add the missing timeout value that is required (not optional) - Split the long line - Also make the AUTH_PENDING state message format in management-notes.txt more precise. Signed-off-by: Selva Nair Acked-By: Arne Schwabe --- doc/management-notes.txt | 2 +- src/openvpn/manage.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/management-notes.txt b/doc/management-notes.txt index c2034429..5b920fa5 100644 --- a/doc/management-notes.txt +++ b/doc/management-notes.txt @@ -658,7 +658,7 @@ implementations the name IV_SSO is kept in lieu of a better name. The management interface of the client receives notification of pending auth via ->STATE:datetime,AUTH_PENDING,[timeout number] +>STATE:datetime,AUTH_PENDING,[timeout number],,,,, If {EXTRA} is present the client is informed using INFOMSG notification as diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 86584c4b..f86c87f2 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -104,8 +104,8 @@ man_help(void) msg(M_CLIENT, "client-auth-nt CID KID : Authenticate client-id/key-id CID/KID"); msg(M_CLIENT, "client-deny CID KID R [CR] : Deny auth client-id/key-id CID/KID with log reason"); msg(M_CLIENT, " text R and optional client reason text CR"); - msg(M_CLIENT, "client-pending-auth CID MSG : Instruct OpenVPN to send AUTH_PENDING and INFO_PRE msg" - " to the client and wait for a final client-auth/client-deny"); + msg(M_CLIENT, "client-pending-auth CID MSG timeout : Instruct OpenVPN to send AUTH_PENDING and INFO_PRE msg"); + msg(M_CLIENT, " to the client and wait for a final client-auth/client-deny"); msg(M_CLIENT, "client-kill CID [M] : Kill client instance CID with message M (def=RESTART)"); msg(M_CLIENT, "env-filter [level] : Set env-var filter level"); #ifdef MANAGEMENT_PF