Skip to contentSkip to conversation

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

PATCH In review Arne Schwabe 2 participants 2 messages Oct 18, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix renewal spelling and actually allow external-auth with renewal time

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

---
 src/openvpn/options.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
src/openvpn/options.c +3 -3
index 60fec147..9f5e4b35 100644
@@ -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]);
Signature · 1 line
2.37.0 (Apple Git-136)
Acked-by on v1 1/1
#1 lore raw

"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 <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg25418.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering