Version 2.1.0

* Updated ChangeLog.

* Note in man page that clients connecting to a --multihome server
  should always use the --nobind option.

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

diff --git a/ChangeLog b/ChangeLog
index 7faba566c7278afac35040d2ec4bdcd4281dfbcd..44747df213cdc7eafc8ca78dde474e6765949dbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
 OpenVPN Change Log
 Copyright (C) 2002-2009 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2009.12.11 -- Version 2.1.0
+
+* Fixed a couple issues in sample plugins auth-pam.c and down-root.c.
+  (1) Fail gracefully rather than segfault if calloc returns NULL.
+  (2) The openvpn_plugin_abort_v1 function can potentially be called
+  with handle == NULL.  Add code to detect this case, and if  so, avoid
+  dereferencing pointers derived from handle  (Thanks to David
+  Sommerseth for finding this bug).
+
+* Documented "multihome" option in the man page.
+
 2009.11.20 -- Version 2.1_rc22
 
 * Fixed a client-side bug on Windows that occurred when the

diff --git a/openvpn.8 b/openvpn.8
index 57844b98b0761cadac3c9d3c3b6b8a503b63c272..45e61fa53c01e64b46c7841f022fde56fdb88e9f 100644 (file)
--- a/openvpn.8
+++ b/openvpn.8
@@ -2125,6 +2125,12 @@ attempt to bind client sessions to the interface on which packets
 are being received, so that outgoing packets will be sent out
 of the same interface.  Note that this option is only relevant for
 UDP servers and currently is only implemented on Linux.
+
+Note: clients connecting to a
+.B --multihome
+server should always use the
+.B --nobind
+option.
 .\"*********************************************************
 .TP
 .B --echo [parms...]

diff --git a/options.c b/options.c
index ae4825c60194ca9684cca79682388b1efa2dac78..c5ca8b67d5c3ebbf41b58f05b105bc97692e9e66 100644 (file)
--- a/options.c
+++ b/options.c
@@ -2744,7 +2744,7 @@ static void
 usage_version (void)
 {
   msg (M_INFO|M_NOPREFIX, "%s", title_string);
-  msg (M_INFO|M_NOPREFIX, "Developed by James Yonan");
+  msg (M_INFO|M_NOPREFIX, "Originally developed by James Yonan");
   msg (M_INFO|M_NOPREFIX, "Copyright (C) 2002-2009 OpenVPN Technologies, Inc. <sales@openvpn.net>");
   openvpn_exit (OPENVPN_EXIT_STATUS_USAGE); /* exit point */
 }

diff --git a/version.m4 b/version.m4
index 1d67696d23d6405d6d9207eaffda88448b695d51..23306ea8b9d1c60cb0fe13a1d6a68ead099cfa68 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1_rc22])
+define(PRODUCT_VERSION,[2.1.0])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])