@@ -25,7 +25,7 @@ dnl Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.50)

-AC_INIT([OpenVPN], [2.1_beta11], [openvpn-users@lists.sourceforge.net], [openvpn])

+AC_INIT([OpenVPN], [2.1_beta11a], [openvpn-users@lists.sourceforge.net], [openvpn])

 AM_CONFIG_HEADER(config.h)

 AC_CONFIG_SRCDIR(syshead.h)

@@ -2979,7 +2979,7 @@ another application, such as an HTTPS server.  If OpenVPN

 senses a connection to its port which is using a non-OpenVPN

 protocol, it will proxy the connection to the server at

 .B host:port.

-Currently only designed to work with HTTPS,

+Currently only designed to work with HTTP/HTTPS,

 though it would be theoretically possible to extend to

 other protocols such as ssh.

@@ -43,8 +43,6 @@

 #include "pkcs11-helper.h"

 #include "pkcs11.h"

-#define snprintf openvpn_snprintf

-

 static

 void

 _pkcs11_openvpn_print (

@@ -856,7 +856,7 @@ port_share_abort (struct port_share *ps)

 bool

 is_openvpn_protocol (const struct buffer *buf)

 {

-  const unsigned char *p = BSTR (buf);

+  const unsigned char *p = (const unsigned char *) BSTR (buf);

   const int len = BLEN (buf);

   if (len >= 3)

     {