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 c6caf2a8923412c423f7ed58c5ef131011ddf49b..37dcfe094f6387fe7d0f3295770b656fa457e81e 100644 (file)
--- 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
        {