[Openvpn-devel,v1] misc.c: remove unused code

Message ID 20240329103739.28254-1-gert@greenie.muc.de
State Accepted
Headers show
Series [Openvpn-devel,v1] misc.c: remove unused code | expand

Commit Message

Gert Doering March 29, 2024, 10:37 a.m. UTC
From: Lev Stipakov <lev@openvpn.net>


  3a4fb1 "Ensure --auth-nocache is handled during renegotiation"

has changed the behavior of set_auth_token(), but left unused parameter

  struct user_pass *up

Remove this parameter and amend comments accordingly. Also remove
unused function definition from misc.h.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>

Change-Id: Ic440f2c8d46dfcb5ff41ba2f33bf28bb7286eec4

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/+/550
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <frank@lichtenheld.com>


Gert Doering March 29, 2024, 11:54 a.m. UTC | #1
Your patch has been applied to the master and release/2.6 branch.

(Trivial and obvious removal of dead code, passes all tests, and having
the code align can be helpful)

commit 4c71e816031f564f834df695b3fa717ea22720d2 (master)
commit f50c67707ed033040c93a6b5d4efbbd2c0933459 (release/2.6)
Author: Lev Stipakov
Date:   Fri Mar 29 11:37:39 2024 +0100

     misc.c: remove unused code

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
     Message-Id: <20240329103739.28254-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28503.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>

kind regards,

Gert Doering


diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c
index 3ff0857..598fbae 100644
--- a/src/openvpn/misc.c
+++ b/src/openvpn/misc.c
@@ -491,19 +491,15 @@ 
-set_auth_token(struct user_pass *up, struct user_pass *tk, const char *token)
+set_auth_token(struct user_pass *tk, const char *token)
     if (strlen(token))
         strncpynt(tk->password, token, USER_PASS_LEN);
         tk->token_defined = true;
-         * --auth-token has no username, so it needs the username
-         * either already set or copied from up, or later set by
-         * --auth-token-user
-         * If already set, tk is fully defined.
+         * If username already set, tk is fully defined.
         if (strlen(tk->username))
diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h
index cb3bf68..963f3e6 100644
--- a/src/openvpn/misc.h
+++ b/src/openvpn/misc.h
@@ -152,26 +152,18 @@ 
     return get_user_pass_cr(up, auth_file, prefix, flags, NULL);
-void fail_user_pass(const char *prefix,
-                    const unsigned int flags,
-                    const char *reason);
 void purge_user_pass(struct user_pass *up, const bool force);
- * Sets the auth-token to token. If a username is available from
- * either up or already present in tk that will be used as default
- * username for the token. The method will also purge up if
+ * Sets the auth-token to token. The method will also purge up if
  * the auth-nocache option is active.
- * @param up        (non Auth-token) Username/password
  * @param tk        auth-token userpass to set
  * @param token     token to use as password for the auth-token
  * @note    all parameters to this function must not be null.
-void set_auth_token(struct user_pass *up, struct user_pass *tk,
-                    const char *token);
+void set_auth_token(struct user_pass *tk, const char *token);
  * Sets the auth-token username by base64 decoding the passed
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 7895a37..7c49451 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -340,7 +340,7 @@ 
 ssl_set_auth_token(const char *token)
-    set_auth_token(&auth_user_pass, &auth_token, token);
+    set_auth_token(&auth_token, token);