summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2009-01-27 21:18:51 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2009-01-27 21:18:51 +0000
commit763602d3e338eb5d9a69d5a9b99bcbd33dabaf11 (patch)
treee4f6c79ad1a0e165d8fbaa925cb0d8e4d44ba9f8
parent7a36c4333203a54b93d1295a834462761d88348e (diff)
downloadopenvpn-763602d3e338eb5d9a69d5a9b99bcbd33dabaf11.tar.gz
openvpn-763602d3e338eb5d9a69d5a9b99bcbd33dabaf11.tar.xz
openvpn-763602d3e338eb5d9a69d5a9b99bcbd33dabaf11.zip
Fixed issue involving an #ifdef in a macro reference that breaks early gcc
compilers. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3903 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--ssl.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ssl.c b/ssl.c
index c6caf2a..37dcfe0 100644
--- a/ssl.c
+++ b/ssl.c
@@ -3398,14 +3398,17 @@ key_method_2_read (struct buffer *buf, struct tls_multi *multi, struct tls_sessi
if ((session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME))
set_common_name (session, up->username);
- msg (D_HANDSHAKE, "TLS: Username/Password authentication %s for username '%s' %s",
#ifdef ENABLE_DEF_AUTH
+ msg (D_HANDSHAKE, "TLS: Username/Password authentication %s for username '%s' %s",
ks->auth_deferred ? "deferred" : "succeeded",
+ up->username,
+ (session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME) ? "[CN SET]" : "");
#else
+ msg (D_HANDSHAKE, "TLS: Username/Password authentication %s for username '%s' %s",
"succeeded",
-#endif
up->username,
(session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME) ? "[CN SET]" : "");
+#endif
}
else
{