Clarified that TAP-Win32 driver is licensed under GPL 2.

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

diff --git a/COPYING b/COPYING
index 21b13cdc88375511b2a023b8305aa2e36d291234..597c10a427ee6d74332530f6e232ee05919babd0 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -53,10 +53,7 @@ TAP-Win32/TAP-Win64 Driver license:
 
   The source and object code of the TAP-Win32/TAP-Win64 driver
   is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., and is released under
-  the GPL version 2 (see below), however due to the extra costs of
-  supporting Windows Vista, OpenVPN Technologies, Inc. reserves the right to
-  change the terms of the TAP-Win32/TAP-Win64 license for versions 9.1
-  and higher prior to the official release of OpenVPN 2.1.
+  the GPL version 2.
 
 Windows DDK Samples:
 --------------------

diff --git a/tap-win32/common.h b/tap-win32/common.h
index b7c115762ce35bcbe078b1095d1ea2a449cf4d69..c8dcd5d767a02b6f96eac917a419d6b1959be552 100755 (executable)
--- a/tap-win32/common.h
+++ b/tap-win32/common.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/constants.h b/tap-win32/constants.h
index fc7855dcd015393b33c73e7e4cb8f602a1b53d1b..220d3d39720bcc1e527f8e36e9cb3b28f5718310 100755 (executable)
--- a/tap-win32/constants.h
+++ b/tap-win32/constants.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/dhcp.c b/tap-win32/dhcp.c
index b6b28bb7f32a74d0d1de998aa329dbc3f59247ae..8ef3917bc631be1441e441706d0cdd36dfb41495 100755 (executable)
--- a/tap-win32/dhcp.c
+++ b/tap-win32/dhcp.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/dhcp.h b/tap-win32/dhcp.h
index 8f40f540048e5bffac0a36b09e329ab63b923735..babe31eca7b86f670ba70bb668d71208554b8499 100755 (executable)
--- a/tap-win32/dhcp.h
+++ b/tap-win32/dhcp.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/endian.h b/tap-win32/endian.h
index ef9376bc4b78b5adee2f4476fb0edef4f5fc73f8..7a298f41b274bfacb4585440325d07e469f1389b 100755 (executable)
--- a/tap-win32/endian.h
+++ b/tap-win32/endian.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/error.c b/tap-win32/error.c
index dd27024e837267fc6901765d6e4162e00ef2f2de..82757cce11854a1c8f00b8b18d0b1c0bbf5e3c13 100755 (executable)
--- a/tap-win32/error.c
+++ b/tap-win32/error.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/error.h b/tap-win32/error.h
index d779af0c008970e8182fbc50402774c5b6330585..d3deb28050dc24c8c921174a682822c3fcc43efb 100755 (executable)
--- a/tap-win32/error.h
+++ b/tap-win32/error.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/hexdump.c b/tap-win32/hexdump.c
index f230569c8d7cf7b346e8ccf3c5f091506662ab7d..b30a8e75927e02102995dbde72457e63bcbfa63b 100755 (executable)
--- a/tap-win32/hexdump.c
+++ b/tap-win32/hexdump.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/hexdump.h b/tap-win32/hexdump.h
index 8814ed143155e09e358f2fb294694638c93e15fb..cfddcf1296f366487390a70b10408bb21cd900ec 100755 (executable)
--- a/tap-win32/hexdump.h
+++ b/tap-win32/hexdump.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/instance.c b/tap-win32/instance.c
index 1c97823a0b753027d2df3ae8433a727499bfaa25..ef994ee65fa29fc98b650077c089859009286337 100755 (executable)
--- a/tap-win32/instance.c
+++ b/tap-win32/instance.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/lock.h b/tap-win32/lock.h
index c3b52b1c1a18a9c7fee1aa350269b33201094ce6..7c3a1a9df346301fc4a9d95a5f1de2c2d8547a73 100755 (executable)
--- a/tap-win32/lock.h
+++ b/tap-win32/lock.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/macinfo.c b/tap-win32/macinfo.c
index 49f21f95755de613d92cc85fa4b07b3bceba71b3..c03a8c5f89bf24a6b0f8825589a864d6cbc65ebf 100755 (executable)
--- a/tap-win32/macinfo.c
+++ b/tap-win32/macinfo.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/macinfo.h b/tap-win32/macinfo.h
index 60ea8cc3ad6ff8412df3f06edc2e5ac53a6c0d76..774e5d6ca6a7a0d82b3ba65211dbc8d1bb877f77 100755 (executable)
--- a/tap-win32/macinfo.h
+++ b/tap-win32/macinfo.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/mem.c b/tap-win32/mem.c
index ab4b2ede15adbdc2de7cc7d621e0e4a2df6a1aae..3f8d949748082d650a9fefdb3537b1301dbfacfe 100755 (executable)
--- a/tap-win32/mem.c
+++ b/tap-win32/mem.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/proto.h b/tap-win32/proto.h
index 6c53f401af0917556fd1e11bdbd7e8e83d8569fd..e0597725b47136d17987c41a593df12f1ba4231e 100755 (executable)
--- a/tap-win32/proto.h
+++ b/tap-win32/proto.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/prototypes.h b/tap-win32/prototypes.h
index 29502d6039bf66657d2a5d376797fe24feaedc9c..ff7733aa4da888d7a97d5a1bea151dd76fd8e320 100755 (executable)
--- a/tap-win32/prototypes.h
+++ b/tap-win32/prototypes.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/tapdrvr.c b/tap-win32/tapdrvr.c
index a856734bdc11f47fade04e878015c8f4afec7ca7..2c6af4853360fa7434e85b696a2c9f5f8fb585d8 100755 (executable)
--- a/tap-win32/tapdrvr.c
+++ b/tap-win32/tapdrvr.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/tap-win32/types.h b/tap-win32/types.h
index 4adee6a6f3992b60fd3d46334c1da9fd6b2393e5..48bdff74babc8ff3496de8cf2d64a6499843a6aa 100755 (executable)
--- a/tap-win32/types.h
+++ b/tap-win32/types.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2