diff options
| -rw-r--r-- | crates/arti/src/cfg.rs | 6 | ||||
| -rw-r--r-- | crates/arti/src/reload_cfg.rs | 1 | ||||
| -rw-r--r-- | crates/tor-keymgr/src/keystore/arti.rs | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/crates/arti/src/cfg.rs b/crates/arti/src/cfg.rs index ea9a5de7d..f3285610a 100644 --- a/crates/arti/src/cfg.rs +++ b/crates/arti/src/cfg.rs @@ -14,9 +14,11 @@ use crate::onion_proxy::{ #[cfg(not(feature = "onion-service-service"))] use crate::onion_proxy_disabled::{OnionServiceProxyConfigMap, OnionServiceProxyConfigMapBuilder}; use arti_client::TorClientConfig; +#[cfg(feature = "onion-service-service")] +use tor_config::define_list_builder_accessors; +use tor_config::resolve_alternative_specs; #[cfg(feature = "rpc")] use tor_config::CfgPath; -use tor_config::{define_list_builder_accessors, resolve_alternative_specs}; pub(crate) use tor_config::{impl_standard_builder, ConfigBuildError, Listen}; use crate::{LoggingConfig, LoggingConfigBuilder}; @@ -170,6 +172,7 @@ fn default_max_files() -> u64 { /// Configuration for Arti's RPC subsystem. /// /// You cannot change this section on a running Arti client. +#[cfg(feature = "rpc")] #[derive(Debug, Clone, Builder, Eq, PartialEq)] #[builder(build_fn(error = "ConfigBuildError"))] #[builder(derive(Debug, Serialize, Deserialize))] @@ -177,7 +180,6 @@ fn default_max_files() -> u64 { #[non_exhaustive] pub struct RpcConfig { /// Location to listen for incoming RPC connections. - #[cfg(feature = "rpc")] #[builder(default = "default_rpc_path()")] pub(crate) rpc_listen: Option<CfgPath>, } diff --git a/crates/arti/src/reload_cfg.rs b/crates/arti/src/reload_cfg.rs index 07b5757dd..a5cf51f30 100644 --- a/crates/arti/src/reload_cfg.rs +++ b/crates/arti/src/reload_cfg.rs @@ -62,6 +62,7 @@ pub(crate) trait ReconfigurableModule: Send + Sync { pub(crate) fn watch_for_config_changes<R: Runtime>( sources: ConfigurationSources, config: &ArtiConfig, + #[cfg_attr(not(target_family = "unix"), allow(unused_variables))] client: &TorClient<R>, modules: Vec<Weak<dyn ReconfigurableModule>>, ) -> anyhow::Result<()> { diff --git a/crates/tor-keymgr/src/keystore/arti.rs b/crates/tor-keymgr/src/keystore/arti.rs index 221b617f4..4bf88ac39 100644 --- a/crates/tor-keymgr/src/keystore/arti.rs +++ b/crates/tor-keymgr/src/keystore/arti.rs @@ -355,6 +355,7 @@ mod tests { let key_path = key_path(&key_store, &KeyType::Ed25519Keypair); let parent = key_path.parent().unwrap(); fs::create_dir_all(parent).unwrap(); + #[cfg(unix)] fs::set_permissions(parent, fs::Permissions::from_mode(0o700)).unwrap(); fs::write(key_path, OPENSSH_ED25519).unwrap(); |