[Openvpn-devel,2/3] auth-token: Fix compiler complaints with --disable-management

Message ID 20190927224536.27480-3-davids@openvpn.net
State Accepted
Headers show
Series Last-minute fixes to auth-token-hmac patch series | expand

Commit Message

David Sommerseth Sept. 27, 2019, 12:45 p.m. UTC
When building with --disable-management, the compiler complains with
implicit declaration of function ‘ssl_clean_auth_token’.  This is due to
the ssl_clean_auth_token() function being declared inside an #ifdef
ENABLE_MANAGEMENT fence where it should not be.

Signed-off-by: David Sommerseth <davids@openvpn.net>
 src/openvpn/ssl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Gert Doering Oct. 1, 2019, 1:15 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Not tested, but looks reasonable.

Your patch has been applied to the master branch.

commit f706d00f7f0cbcf26d2f8e58a684889cf3b9cf7d
Author: David Sommerseth
Date:   Sat Sep 28 00:45:35 2019 +0200

     auth-token: Fix compiler complaints with --disable-management

     Signed-off-by: David Sommerseth <davids@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20190927224536.27480-3-davids@openvpn.net>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18873.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>

kind regards,

Gert Doering


diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h
index e98c54c7..a944ca3a 100644
--- a/src/openvpn/ssl.h
+++ b/src/openvpn/ssl.h
@@ -431,6 +431,8 @@  void ssl_purge_auth(const bool auth_user_pass_only);
 void ssl_set_auth_token(const char *token);
+bool ssl_clean_auth_token(void);
  * ssl_get_auth_challenge will parse the server-pushed auth-failed
@@ -439,8 +441,6 @@  void ssl_set_auth_token(const char *token);
 void ssl_purge_auth_challenge(void);
-bool ssl_clean_auth_token(void);
 void ssl_put_auth_challenge(const char *cr_str);