diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-04-25 21:37:49 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-04-25 21:37:49 +0000 |
| commit | 657ecf14acc58a6d345341a5e36411bde5be9cd9 (patch) | |
| tree | 4f5a53feb9c26991d822e2e606de511f57e32be6 /service-win32/service.patch | |
| parent | 8edd43829bd7c47f5c5fa809b26a7de7ac4ded08 (diff) | |
| download | openvpn-657ecf14acc58a6d345341a5e36411bde5be9cd9.tar.gz openvpn-657ecf14acc58a6d345341a5e36411bde5be9cd9.tar.xz openvpn-657ecf14acc58a6d345341a5e36411bde5be9cd9.zip | |
TAP driver now passes signing tests on Vista x64.
Added new settings to settings.in to better control
build process.
Removed some unneeded JYFIXMEs from source code.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1874 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'service-win32/service.patch')
| -rwxr-xr-x | service-win32/service.patch | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/service-win32/service.patch b/service-win32/service.patch index 3b45549..8e4ddf9 100755 --- a/service-win32/service.patch +++ b/service-win32/service.patch @@ -1,5 +1,5 @@ ---- service.c.orig Mon Jan 30 10:03:35 2006 -+++ service.c Mon Jan 30 10:16:33 2006 +--- service.c.orig Tue Apr 24 14:49:30 2007 ++++ service.c Tue Apr 24 12:20:08 2007 @@ -16,6 +16,7 @@ service_main(DWORD dwArgc, LPTSTR *lpszArgv); CmdInstallService(); @@ -319,27 +319,33 @@ } if ( lpszTemp ) ---- service.h.orig Mon Jan 30 10:03:35 2006 -+++ service.h Mon Jan 30 10:03:35 2006 -@@ -62,13 +62,13 @@ +--- service.h.orig Tue Apr 24 14:49:30 2007 ++++ service.h Tue Apr 24 11:58:48 2007 +@@ -57,18 +57,19 @@ + extern "C" { + #endif + ++#include "../autodefs/defs.h" + + ////////////////////////////////////////////////////////////////////////////// //// todo: change to desired strings //// // name of the executable -#define SZAPPNAME "Simple" -+#define SZAPPNAME "openvpnserv" ++#define SZAPPNAME PRODUCT_UNIX_NAME "serv" // internal name of the service -#define SZSERVICENAME "SimpleService" -+#define SZSERVICENAME "OpenVPNService" ++#define SZSERVICENAME PRODUCT_NAME "Service" // displayed name of the service -#define SZSERVICEDISPLAYNAME "Simple Service" -+#define SZSERVICEDISPLAYNAME "OpenVPN Service" ++#define SZSERVICEDISPLAYNAME PRODUCT_NAME " Service" // list of service dependencies - "dep1\0dep2\0\0" -#define SZDEPENDENCIES "" -+#define SZDEPENDENCIES "TAP0901\0Dhcp\0\0" ++#define SZDEPENDENCIES PRODUCT_TAP_ID "\0Dhcp\0\0" ////////////////////////////////////////////////////////////////////////////// -@@ -126,7 +126,10 @@ +@@ -126,7 +127,10 @@ // RETURN VALUE: // none // |