From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Tue, 27 Jan 2009 21:18:51 +0000 (+0000)
Subject: Fixed issue involving an #ifdef in a macro reference that breaks early gcc
X-Git-Tag: v2.1_rc16~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=763602d3e338eb5d9a69d5a9b99bcbd33dabaf11;p=thirdparty%2Fopenvpn.git

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
---

diff --git a/ssl.c b/ssl.c
index c6caf2a89..37dcfe094 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
 	{