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/openvpnserv.c | |
| 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/openvpnserv.c')
| -rwxr-xr-x | service-win32/openvpnserv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/service-win32/openvpnserv.c b/service-win32/openvpnserv.c index 0a64a67..76323ca 100755 --- a/service-win32/openvpnserv.c +++ b/service-win32/openvpnserv.c @@ -65,13 +65,13 @@ struct security_attributes * Control Manager which will cause an asynchronous call * of ServiceStop below. */ -#define EXIT_EVENT_NAME "openvpn_exit_1" +#define EXIT_EVENT_NAME PRODUCT_UNIX_NAME "_exit_1" /* * Which registry key in HKLM should * we get config info from? */ -#define REG_KEY "SOFTWARE\\OpenVPN" +#define REG_KEY "SOFTWARE\\" PRODUCT_NAME static HANDLE exit_event = NULL; @@ -398,7 +398,7 @@ VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) mysnprintf (log_path, "%s\\%s", log_dir, log_file); /* construct command line */ - mysnprintf (command_line, "openvpn --service %s 1 --config \"%s\"", + mysnprintf (command_line, PRODUCT_UNIX_NAME " --service %s 1 --config \"%s\"", EXIT_EVENT_NAME, find_obj.cFileName); @@ -406,7 +406,7 @@ VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) be inherited. */ if (!init_security_attributes_allow_all (&sa)) { - MSG (M_SYSERR, "InitializeSecurityDescriptor start_openvpn failed"); + MSG (M_SYSERR, "InitializeSecurityDescriptor start_" PRODUCT_UNIX_NAME " failed"); goto finish; } |