Minor fixes for gcc (GCC) 4.0.2 warnings.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@905 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/configure.ac b/configure.ac
index 416d7f49a0afc39320613c28ff879129a0906405..f269e9f97d81cd7960c786471596ec3454d71c21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)
 

diff --git a/openvpn.8 b/openvpn.8
index 74f422ab47be99f2ad281f3667abe600c90ca662..6b3711b4e7748c426fbd1c6e9bf60c55e2866daa 100644 (file)
--- a/openvpn.8
+++ b/openvpn.8
@@ -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.
 

diff --git a/pkcs11.c b/pkcs11.c
index 240bad6d9ac34fa8ba135bca37cfcd6be8dcabfd..a8875cfd37f8da540d1055cb8869ab9e6dbe4e6c 100644 (file)
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -43,8 +43,6 @@
 #include "pkcs11-helper.h"
 #include "pkcs11.h"
 
-#define snprintf openvpn_snprintf
-
 static
 void
 _pkcs11_openvpn_print (

diff --git a/ps.c b/ps.c
index ef123e789158f18b3f5d225d649c84d96faced73..a97bbe5031caa770cd5046a419ecef88a682e0b7 100644 (file)
--- a/ps.c
+++ b/ps.c
@@ -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)
     {