@@ -313,18 +313,18 @@ fn copy_sidecar_client_tls_if_present(
313313
314314#[ cfg( target_os = "linux" ) ]
315315fn run_network_init (
316- proxy_uid : u32 ,
317- proxy_gid : u32 ,
316+ network_proxy_uid : u32 ,
317+ network_proxy_gid : u32 ,
318318 sidecar_state_dir : & str ,
319319 sidecar_tls_dir : & str ,
320320) -> Result < ( ) > {
321- if proxy_uid < openshell_policy:: MIN_SANDBOX_UID {
321+ if network_proxy_uid < openshell_policy:: MIN_SANDBOX_UID {
322322 return Err ( miette:: miette!(
323323 "--proxy-uid must be at least {}" ,
324324 openshell_policy:: MIN_SANDBOX_UID
325325 ) ) ;
326326 }
327- if proxy_gid < openshell_policy:: MIN_SANDBOX_UID {
327+ if network_proxy_gid < openshell_policy:: MIN_SANDBOX_UID {
328328 return Err ( miette:: miette!(
329329 "--proxy-gid must be at least {}" ,
330330 openshell_policy:: MIN_SANDBOX_UID
@@ -333,15 +333,20 @@ fn run_network_init(
333333
334334 let sidecar_state_dir = Path :: new ( sidecar_state_dir) ;
335335 let sidecar_tls_dir = Path :: new ( sidecar_tls_dir) ;
336- prepare_sidecar_directory ( sidecar_state_dir, proxy_uid, proxy_gid, 0o775 ) ?;
337- prepare_sidecar_directory ( sidecar_tls_dir, proxy_uid, proxy_gid, 0o755 ) ?;
336+ prepare_sidecar_directory (
337+ sidecar_state_dir,
338+ network_proxy_uid,
339+ network_proxy_gid,
340+ 0o775 ,
341+ ) ?;
342+ prepare_sidecar_directory ( sidecar_tls_dir, network_proxy_uid, network_proxy_gid, 0o755 ) ?;
338343 copy_sidecar_client_tls_if_present (
339344 Path :: new ( CLIENT_TLS_DIR ) ,
340345 sidecar_tls_dir,
341- proxy_uid ,
342- proxy_gid ,
346+ network_proxy_uid ,
347+ network_proxy_gid ,
343348 ) ?;
344- openshell_supervisor_process:: netns:: install_sidecar_bypass_rules ( proxy_uid )
349+ openshell_supervisor_process:: netns:: install_sidecar_bypass_rules ( network_proxy_uid )
345350}
346351
347352#[ cfg( not( target_os = "linux" ) ) ]
0 commit comments