mirror of
https://github.com/openai/codex.git
synced 2026-11-08 20:40:33 +00:00
Merge remote-tracking branch 'refs/remotes/origin/main' into dev/winston/credentialed-routes-discovery
# Conflicts: # codex-rs/backend-client/src/client.rs # codex-rs/backend-client/src/lib.rs # codex-rs/network-proxy/Cargo.toml # codex-rs/network-proxy/README.md # codex-rs/network-proxy/src/certs.rs # codex-rs/network-proxy/src/proxy.rs
This commit is contained in:
@@ -190,6 +190,7 @@ async fn run_cmd_result_with_permission_profile_for_cwd(
|
||||
params,
|
||||
&permission_profile,
|
||||
&sandbox_cwd,
|
||||
std::slice::from_ref(&sandbox_cwd),
|
||||
&codex_linux_sandbox_exe,
|
||||
use_legacy_landlock,
|
||||
/*stdout_stream*/ None,
|
||||
@@ -448,6 +449,7 @@ async fn assert_network_blocked(cmd: &[&str]) {
|
||||
params,
|
||||
&permission_profile,
|
||||
&sandbox_cwd,
|
||||
std::slice::from_ref(&sandbox_cwd),
|
||||
&codex_linux_sandbox_exe,
|
||||
/*use_legacy_landlock*/ false,
|
||||
/*stdout_stream*/ None,
|
||||
|
||||
Reference in New Issue
Block a user