saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-10-31 02:08:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

add EXE_SUFFIX to sendmail executable when not specified

Browse Source
This commit is contained in:
soruh
2023-02-02 22:05:44 +01:00
parent 8cc6dac893
commit 9e3d7ea44c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/config.rs
View File

@@ -1,3 +1,4 @@
use std::env::consts::EXE_SUFFIX;
use std::process::exit; use std::process::exit;
use std::sync::RwLock; use std::sync::RwLock;
@@ -749,12 +750,12 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
} }
if cfg.use_sendmail { if cfg.use_sendmail {
let command = cfg.sendmail_command.as_deref().unwrap_or("sendmail"); let command = cfg.sendmail_command.clone().unwrap_or_else(|| format!("sendmail{EXE_SUFFIX}"));
let mut path = std::path::PathBuf::from(command); let mut path = std::path::PathBuf::from(&command);
if !path.is_absolute() { if !path.is_absolute() {
match which::which(command) { match which::which(&command) {
Ok(result) => path = result, Ok(result) => path = result,
Err(_) => err!(format!("sendmail command {command:?} not found in $PATH")), Err(_) => err!(format!("sendmail command {command:?} not found in $PATH")),
} }