From 28549038ac2d729ee2f796ae4ea976e77c49cd1e Mon Sep 17 00:00:00 2001 From: james Date: Thu, 23 Feb 2006 13:14:55 +0000 Subject: 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 --- configure.ac | 2 +- openvpn.8 | 2 +- pkcs11.c | 2 -- ps.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 416d7f4..f269e9f 100644 --- 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 74f422a..6b3711b 100644 --- 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 240bad6..a8875cf 100644 --- 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 ef123e7..a97bbe5 100644 --- 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) { -- cgit