Skip to contentSkip to conversation

Added missing #ifdef to allow --disable-managent to work again

PATCH In review Adriaan de Jong 3 participants 3 messages Oct 24, 2011

lore
Share & tools
lore

Adriaan de Jong

author
#0 lore raw

PATCH 1/1 Added missing #ifdef to allow --disable-managent to work again

Signed-off-by Adriaan de Jong <[email protected]...>
---
 ssl_verify.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
ssl_verify.h +4 -1
index 1eaf639..1809137 100644
@@ -172,7 +172,10 @@ static inline bool verify_user_pass_enabled(struct tls_session *session)
 {
   return (session->opt->auth_user_pass_verify_script
         || plugin_defined (session->opt->plugins, OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY)
-        || management_enable_def_auth (management));
+#ifdef MANAGEMENT_DEF_AUTH
+        || management_enable_def_auth (management)
+#endif
+        );
 }
 
 /**
Signature · 1 line
1.7.5.4
#1 lore raw

Hi,

ssl_verify.h static inline bool verify_user_pass_enabled(struct tls_session *session) · line 179

Quoted 10 lines · Adriaan de Jong
ssl_verify.h +4 -1
@@ -172,7 +172,10 @@ static inline bool verify_user_pass_enabled(struct tls_session *session)
 {
   return (session->opt->auth_user_pass_verify_script
         || plugin_defined (session->opt->plugins, OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY)
-        || management_enable_def_auth (management));
+#ifdef MANAGEMENT_DEF_AUTH
+        || management_enable_def_auth (management)
+#endif
+        );
 }

ACK.

gert

Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...
#2 lore raw
In reply to Adriaan de Jong

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 1 line · Adriaan de Jong
Signed-off-by Adriaan de Jong <[email protected]...>

Applied to master branch in -testing and -stable trees.

commit 7c785a27bfe5267ee4aac12fe6d0a24c42e388d6

Author: Adriaan de Jong <[email protected]...>
Date:   Mon Oct 24 11:39:05 2011 +0200
    Added missing #ifdef to allow --disable-managent to work again

    Signed-off-by: Adriaan de Jong <[email protected]...>
    Acked-by: Gert Doering <[email protected]...>
    Signed-off-by: David Sommerseth <[email protected]...>

kind regards,

David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6lPCYACgkQDC186MBRfroGXgCeMOAdUqK6IEskhbTa6RpT+/RM NygAniULo59KPmbfEufbrv+bVJHm4WOL
=M39S
-----END PGP SIGNATURE-----