ovpnagent: fix quoting of omiclient parameters
PATCH 1/2 ovpnagent: fix quoting of omiclient parameters
--- openvpn/ovpnagent/win/ovpnagent.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
openvpn/ovpnagent/win/ovpnagent.cpp +4 -2
@@ -444,14 +444,16 @@ public: // create command line for openvpn process std::ostringstream ss; - ss << "client --config " << config_dir << "\\" << config_file << " --exit-event-name " + ss << "client --config \"" << config_dir << "\\" << config_file << "\" --exit-event-name " << exit_event_name << " --auth-retry interact --management " << management_host << " " << management_port << " stdin --management-query-passwords --management-hold " << "--log" - << (log_append ? "-append " : " ") << log; + << (log_append ? "-append \"" : " \"") << log << "\""; std::string cmd = ss.str(); std::unique_ptr<char[]> buf(new char[cmd.length() + 1]); strcpy(buf.get(), cmd.c_str()); + // OPENVPN_LOG("Launching omiclient: " << config.omiclient_exe.c_str() << " " << buf.get()); + STARTUPINFO startup_info = { 0 }; startup_info.cb = sizeof(startup_info); startup_info.dwFlags = STARTF_USESTDHANDLES;
Signature · 1 line
2.34.1
PATCH 2/2 omi: add support for ovpn-dco-win
--- openvpn/omi/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+)
openvpn/omi/CMakeLists.txt +9 -0
@@ -1,3 +1,5 @@ +option(CLI_OVPNDCOWIN "Build ovpncli with ovpn-dco-win driver support" OFF) + add_executable(omicliagent openvpn.cpp) add_core_dependencies(omicliagent) add_json_library(omicliagent)
@@ -5,3 +7,10 @@ target_compile_definitions(omicliagent PRIVATE -DOPENVPN_COMMAND_AGENT -DOVPNAGE add_executable(omicli openvpn.cpp) add_core_dependencies(omicli) + +if (WIN32 AND ${CLI_OVPNDCOWIN}) + target_compile_definitions(omicliagent PRIVATE ENABLE_OVPNDCOWIN) + target_compile_definitions(omicli PRIVATE ENABLE_OVPNDCOWIN) + target_link_libraries(omicliagent "bcrypt.lib") + target_link_libraries(omicli "bcrypt.lib") +endif ()
Signature · 1 line
2.34.1
Re: [Openvpn-devel] [PATCH OpenVPN3 2/2] omi: add support for ovpn-dco-win
As discussed at https://github.com/OpenVPN/openvpn3/pull/218
ti 7. kesäk. 2022 klo 20.26 Christopher Ng ([email protected]...) kirjoitti:
Quoted 38 lines
Signed-off-by Christopher Ng <[email protected]...>--- openvpn/omi/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+)openvpn/omi/CMakeLists.txt +2
-0@@ -1,3 +1,5 @@ +option(CLI_OVPNDCOWIN "Build ovpncli with ovpn-dco-win driver support" OFF) + add_executable(omicliagent openvpn.cpp) add_core_dependencies(omicliagent)
add_json_library(omicliagent)openvpn/omi/CMakeLists.txt +7
-2@@ -5,3 +7,10 @@ target_compile_definitions(omicliagent PRIVATE -DOPENVPN_COMMAND_AGENT -DOVPNAGE add_executable(omicli openvpn.cpp) add_core_dependencies(omicli) + +if (WIN32 AND ${CLI_OVPNDCOWIN}) + target_compile_definitions(omicliagent PRIVATE ENABLE_OVPNDCOWIN) + target_compile_definitions(omicli PRIVATE ENABLE_OVPNDCOWIN) + target_link_libraries(omicliagent "bcrypt.lib") + target_link_libraries(omicli "bcrypt.lib") +endif () --2.34.1
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Signature · 1 line
-Lev
Re: [Openvpn-devel] [PATCH applied OpenVPN3 2/2] omi: add support for ovpn-dco-win
In reply to Christopher NgFrom: David Sommerseth <[email protected]...>
Your patch has been applied to the master branch
commit 94848c3cc3f5ea1fec97ab6b18ba7eff6923561d master
Author: Christopher Ng Date: Tue, 07 Jun 2022 16:30:49 +0000
omi: add support for ovpn-dco-win
Signed-off-by: Christopher Ng
Acked-by: Lev Stipakov
Patchwork-Id: 2509
URL: https://patchwork.openvpn.net/patch/2509/
Message-Id: <[email protected]...>
Signed-off-by: David Sommerseth
--
kind regards,
David Sommerseth
As per discussion on https://github.com/OpenVPN/openvpn3/pull/218
ti 7. kesäk. 2022 klo 20.30 Christopher Ng ([email protected]...) kirjoitti:
Quoted 44 lines
Signed-off-by Christopher Ng <[email protected]...>--- openvpn/ovpnagent/win/ovpnagent.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)openvpn/ovpnagent/win/ovpnagent.cpp +1
-2@@ -444,14 +444,16 @@ public: // create command line for openvpn process std::ostringstream ss; - ss << "client --config " << config_dir << "\\" << config_file << " --exit-event-name " + ss << "client --config \"" << config_dir << "\\" << config_file <<"\" --exit-event-name "
<< exit_event_name << " --auth-retry interact --management " << management_host << " " << management_port << " stdin --management-query-passwords--management-hold " << "--log"
openvpn/ovpnagent/win/ovpnagent.cpp +2
-1- << (log_append ? "-append " : " ") << log; + << (log_append ? "-append \"" : " \"") << log << "\""; std::string cmd = ss.str(); std::unique_ptr<char[]> buf(new char[cmd.length() + 1]); strcpy(buf.get(), cmd.c_str()); + // OPENVPN_LOG("Launching omiclient: " <<
config.omiclient_exe.c_str()<< " " <<buf.get()); +STARTUPINFO startup_info = { 0 }; startup_info.cb = sizeof(startup_info); startup_info.dwFlags = STARTF_USESTDHANDLES;--
2.34.1_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Signature · 1 line
-Lev
From: David Sommerseth <[email protected]...>
Your patch has been applied to the master branch
commit 452e7cb6259d40ae0a1ff749d22a1634c7100fc9 master
Author: Christopher Ng Date: Tue, 07 Jun 2022 16:30:48 +0000
ovpnagent: fix quoting of omiclient parameters
Signed-off-by: Christopher Ng
Acked-by: Lev Stipakov
Patchwork-Id: 2510
URL: https://patchwork.openvpn.net/patch/2510/
Message-Id: <[email protected]...>
Signed-off-by: David Sommerseth
--
kind regards,
David Sommerseth