From 32f25b391f8761007df3c3de138d407a038e19d1 Mon Sep 17 00:00:00 2001 From: Lev Stipakov Date: Wed, 6 Sep 2023 16:21:41 +0200 Subject: [PATCH] Send the whole version in IV_GUI_VER Current IV_GUI_VER is always 11 which is not very helpful. Signed-off-by: Lev Stipakov --- config-msvc.h.in | 3 --- openvpn.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/config-msvc.h.in b/config-msvc.h.in index 7955bec..48b667a 100644 --- a/config-msvc.h.in +++ b/config-msvc.h.in @@ -9,9 +9,6 @@ /* Define to the full name of this package. */ #define PACKAGE_NAME "OpenVPN GUI" -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "OpenVPN GUI 11" - /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "openvpn-gui" diff --git a/openvpn.c b/openvpn.c index 9cd6527..b6228a1 100644 --- a/openvpn.c +++ b/openvpn.c @@ -2719,11 +2719,11 @@ LaunchOpenVPN(connection_t *c) /* Construct command line -- put log first */ _sntprintf_0(cmdline, _T("openvpn --log%ls \"%ls\" --config \"%ls\" " - "--setenv IV_GUI_VER \"%hs\" --setenv IV_SSO openurl,webauth,crtext --service %ls 0 --auth-retry interact " + "--setenv IV_GUI_VER \"%hs %hs\" --setenv IV_SSO openurl,webauth,crtext --service %ls 0 --auth-retry interact " "--management %hs %hd stdin --management-query-passwords %ls" "--management-hold"), (o.log_append ? _T("-append") : _T("")), c->log_path, - c->config_file, PACKAGE_STRING, exit_event_name, + c->config_file, PACKAGE_NAME, PACKAGE_VERSION_RESOURCE_STR, exit_event_name, inet_ntoa(c->manage.skaddr.sin_addr), ntohs(c->manage.skaddr.sin_port), (o.proxy_source != config ? _T("--management-query-proxy ") : _T("")));