diff mbox series

[Openvpn-devel] Fix renewal spelling and actually allow external-auth with renewal time

Message ID 20221018143704.2759522-1-arne@rfc2549.org
State Accepted
Headers
Series [Openvpn-devel] Fix renewal spelling and actually allow external-auth with renewal time |

Commit Message

Arne Schwabe Oct. 18, 2022, 2:37 p.m. UTC 
  The previous commit  9a516170 forgot to change to allow more than 2 parameters
to auth-gen-token, so you could eitherh ave renewal time or external-auth but
not both. Also fix two instances of misspelled auth-gen-token

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 src/openvpn/options.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Gert Doering Oct. 18, 2022, 3:27 p.m. UTC | #1 
Acked-by: Gert Doering <gert@greenie.muc.de>

"That's what I get for testing the core of the patch, and ignoring all
the little details..." - fixes are straightforward.  Only compile-tested.

Your patch has been applied to the master branch.

commit 92db3227b682518ff8c5dc691ee15a1641899729
Author: Arne Schwabe
Date:   Tue Oct 18 16:37:04 2022 +0200

     Fix renewal spelling and actually allow external-auth with renewal time

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20221018143704.2759522-1-arne@rfc2549.org>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25418.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 60fec147..9f5e4b35 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -2635,7 +2635,7 @@  options_postprocess_verify_ce(const struct options *options,
         if (options->auth_token_generate && options->auth_token_renewal
             && options->auth_token_renewal < 2 * options->handshake_window)
         {
-            msg(M_USAGE, "--auth-gen-token reneweal time needs to be at least "
+            msg(M_USAGE, "--auth-gen-token renewal time needs to be at least "
                 " two times --hand-window (%d).",
                 options->handshake_window);
 
@@ -7476,7 +7476,7 @@  add_option(struct options *options,
                         &options->auth_user_pass_verify_script,
                         p[1], "auth-user-pass-verify", true);
     }
-    else if (streq(p[0], "auth-gen-token") && !p[3])
+    else if (streq(p[0], "auth-gen-token"))
     {
         VERIFY_PERMISSION(OPT_P_GENERAL);
         options->auth_token_generate = true;
@@ -7484,7 +7484,7 @@  add_option(struct options *options,
 
         for (int i = 2; i < MAX_PARMS && p[i] != NULL; i++)
         {
-            /* the second parameter can be the reneweal time */
+            /* the second parameter can be the renewal time */
             if (i == 2 && positive_atoi(p[i]))
             {
                 options->auth_token_renewal = positive_atoi(p[i]);