mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-22 15:46:13 -05:00
fix: compile privileged VPN scripts on Unix
This commit is contained in:
4 files changed
+7
-2
No files matched your search
@@ -685,6 +685,7 @@ jobs:
|
|||||||
git \
|
git \
|
||||||
rust \
|
rust \
|
||||||
libiconv \
|
libiconv \
|
||||||
|
bzip2 \
|
||||||
gettext-tools \
|
gettext-tools \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ impl Cli {
|
|||||||
));
|
));
|
||||||
|
|
||||||
let mut vpn_task = VpnTask::new(ws_req_rx, vpn_state_tx, externally_brokered, trusted_csd_uid);
|
let mut vpn_task = VpnTask::new(ws_req_rx, vpn_state_tx, externally_brokered, trusted_csd_uid);
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
let idle_vpn_state_rx = vpn_state_rx.clone();
|
let idle_vpn_state_rx = vpn_state_rx.clone();
|
||||||
let ws_server = WsServer::new(
|
let ws_server = WsServer::new(
|
||||||
env!("CARGO_PKG_VERSION"),
|
env!("CARGO_PKG_VERSION"),
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ use super::selection::{ScriptSource, select};
|
|||||||
|
|
||||||
pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> anyhow::Result<VpnBuilder> {
|
pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> anyhow::Result<VpnBuilder> {
|
||||||
let installed = gpservice::vpnc_script::installed_script()?;
|
let installed = gpservice::vpnc_script::installed_script()?;
|
||||||
match select(installed.as_deref(), args.vpnc_script()) {
|
let legacy = args.vpnc_script();
|
||||||
|
match select(installed.as_deref(), legacy.as_deref()) {
|
||||||
ScriptSource::Installed(path) => {
|
ScriptSource::Installed(path) => {
|
||||||
Ok(Vpn::builder(server, cookie).script_path(Some(path.to_string_lossy().into_owned())))
|
Ok(Vpn::builder(server, cookie).script_path(Some(path.to_string_lossy().into_owned())))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
pub(crate) mod command_traits;
|
mod command_traits;
|
||||||
mod desktop_session_env;
|
mod desktop_session_env;
|
||||||
pub(crate) mod gui_helper_launcher;
|
pub(crate) mod gui_helper_launcher;
|
||||||
|
|
||||||
|
pub use command_traits::CommandExt;
|
||||||
|
|
||||||
pub mod auth_launcher;
|
pub mod auth_launcher;
|
||||||
pub mod gui_launcher;
|
pub mod gui_launcher;
|
||||||
pub mod hip_launcher;
|
pub mod hip_launcher;
|
||||||
|
|||||||
Reference in new issue
Block a user