[Openvpn-devel] OpenVPN 2.1_rc15 GCC 2.96 incompatibility

[Jos Vos]

Hi,

While there were some incompatibilities with older GCC releases
resolved from RC9 to RC15 (I didn't try the releases RC10-RC14),
a new incompatibility was introduced concerning the C preprocessor
in ssl.c: #ifdef's in macro calls do not seem to be allowed with
GCC 2.96.

Attached a brute-force patch to fix that.  This patch was tested
on Red Hat Linux 7.3 with GCC 2.96.

Regards,

-- 
--    Jos Vos <j...@xos.nl>
--    X/OS Experts in Open Systems BV   |   Phone: +31 20 6938364
--    Amsterdam, The Netherlands        |     Fax: +31 20 6948204

--- openvpn-2.1_rc15/ssl.c.orig Tue Nov 18 03:57:27 2008
+++ openvpn-2.1_rc15/ssl.c      Tue Jan 27 14:21:02 2009
@@ -3398,14 +3398,17 @@

          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
        {