Re: [Openvpn-devel] [PATCH OpenVPN3 1/2] ovpnagent: fix quoting of omiclient parameters

2022-06-08 Thread Lev Stipakov 
As per discussion on https://github.com/OpenVPN/openvpn3/pull/218

Acked-by: Lev Stipakov 

ti 7. kesäk. 2022 klo 20.30 Christopher Ng (fac...@gmail.com) kirjoitti:

> Signed-off-by: Christopher Ng 
> ---
>  openvpn/ovpnagent/win/ovpnagent.cpp | 6 --
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/openvpn/ovpnagent/win/ovpnagent.cpp
> b/openvpn/ovpnagent/win/ovpnagent.cpp
> index 8a31b0aa..fa020e7d 100644
> --- a/openvpn/ovpnagent/win/ovpnagent.cpp
> +++ b/openvpn/ovpnagent/win/ovpnagent.cpp
> @@ -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 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
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>


-- 
-Lev
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH OpenVPN3 1/2] ovpnagent: fix quoting of omiclient parameters

2022-06-07 Thread Christopher Ng 
Signed-off-by: Christopher Ng 
---
 openvpn/ovpnagent/win/ovpnagent.cpp | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openvpn/ovpnagent/win/ovpnagent.cpp 
b/openvpn/ovpnagent/win/ovpnagent.cpp
index 8a31b0aa..fa020e7d 100644
--- a/openvpn/ovpnagent/win/ovpnagent.cpp
+++ b/openvpn/ovpnagent/win/ovpnagent.cpp
@@ -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 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
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel