Merge pull request #15 from selvanair/make-log-first-option

Put --log first in the command line
pull/19/head
Samuli Seppänen 9 years ago
commit f415fe8c83

@ -682,12 +682,13 @@ StartOpenVPN(connection_t *c)
/* Create a management interface password */ /* Create a management interface password */
GetRandomPassword(c->manage.password, sizeof(c->manage.password) - 1); GetRandomPassword(c->manage.password, sizeof(c->manage.password) - 1);
/* Construct command line */ /* Construct command line -- put log first */
_sntprintf_0(cmdline, _T("openvpn --config \"%s\" " _sntprintf_0(cmdline, _T("openvpn --log%s \"%s\" --config \"%s\" "
"--setenv IV_GUI_VER \"%S\" --service %s 0 --log%s \"%s\" --auth-retry interact " "--setenv IV_GUI_VER \"%S\" --service %s 0 --auth-retry interact "
"--management %S %hd stdin --management-query-passwords %s" "--management %S %hd stdin --management-query-passwords %s"
"--management-hold"), c->config_file, PACKAGE_STRING, exit_event_name, "--management-hold"),
(o.append_string[0] == '1' ? _T("-append") : _T("")), c->log_path, (o.append_string[0] == '1' ? _T("-append") : _T("")), c->log_path,
c->config_file, PACKAGE_STRING, exit_event_name,
inet_ntoa(c->manage.skaddr.sin_addr), ntohs(c->manage.skaddr.sin_port), inet_ntoa(c->manage.skaddr.sin_addr), ntohs(c->manage.skaddr.sin_port),
(o.proxy_source != config ? _T("--management-query-proxy ") : _T(""))); (o.proxy_source != config ? _T("--management-query-proxy ") : _T("")));

Loading…
Cancel
Save