Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-04 02:18:00 +01:00
add EXE_SUFFIX to sendmail executable when not specified
Dieser Commit ist enthalten in:
Ursprung
8cc6dac893
Commit
9e3d7ea44c
1 geänderte Dateien mit 4 neuen und 3 gelöschten Zeilen
|
@ -1,3 +1,4 @@
|
|||
use std::env::consts::EXE_SUFFIX;
|
||||
use std::process::exit;
|
||||
use std::sync::RwLock;
|
||||
|
||||
|
@ -749,12 +750,12 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
|
|||
}
|
||||
|
||||
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() {
|
||||
match which::which(command) {
|
||||
match which::which(&command) {
|
||||
Ok(result) => path = result,
|
||||
Err(_) => err!(format!("sendmail command {command:?} not found in $PATH")),
|
||||
}
|
||||
|
|
Laden …
In neuem Issue referenzieren