Unverified Commit d509ef75 authored by Honza Hommer's avatar Honza Hommer
Browse files

make MAIL_FROM not required

parent d180f01b
...@@ -27,11 +27,14 @@ mail_send() { ...@@ -27,11 +27,14 @@ mail_send() {
fi fi
MAIL_FROM="${MAIL_FROM:-$(_readaccountconf_mutable MAIL_FROM)}" MAIL_FROM="${MAIL_FROM:-$(_readaccountconf_mutable MAIL_FROM)}"
if [ -z "$MAIL_FROM" ]; then if [ -n "$MAIL_FROM" ]; then
MAIL_FROM="$USER@$(hostname -f)" if ! _contains "$MAIL_FROM" "@"; then
_info "The MAIL_FROM is not set, so use the default value: $MAIL_FROM" _err "It seems that the MAIL_FROM=$MAIL_FROM is not a valid email address."
return 1
fi
_saveaccountconf_mutable MAIL_FROM "$MAIL_FROM"
fi fi
_saveaccountconf_mutable MAIL_FROM "$MAIL_FROM"
MAIL_TO="${MAIL_TO:-$(_readaccountconf_mutable MAIL_TO)}" MAIL_TO="${MAIL_TO:-$(_readaccountconf_mutable MAIL_TO)}"
if [ -z "$MAIL_TO" ]; then if [ -z "$MAIL_TO" ]; then
...@@ -57,7 +60,11 @@ mail_send() { ...@@ -57,7 +60,11 @@ mail_send() {
_mail_send() { _mail_send() {
case "$_MAIL_BIN" in case "$_MAIL_BIN" in
sendmail) sendmail)
"$_MAIL_BIN" -f "$MAIL_FROM" "$MAIL_TO" if [ -n "$MAIL_FROM" ]; then
"$_MAIL_BIN" -f "$MAIL_FROM" "$MAIL_TO"
else
"$_MAIL_BIN" "$MAIL_TO"
fi
;; ;;
ssmtp) ssmtp)
"$_MAIL_BIN" "$MAIL_TO" "$_MAIL_BIN" "$MAIL_TO"
...@@ -70,7 +77,10 @@ _mail_send() { ...@@ -70,7 +77,10 @@ _mail_send() {
_mail_body() { _mail_body() {
if [ "$_MAIL_BIN" = "sendmail" ] || [ "$_MAIL_BIN" = "ssmtp" ]; then if [ "$_MAIL_BIN" = "sendmail" ] || [ "$_MAIL_BIN" = "ssmtp" ]; then
echo "From: $MAIL_FROM" if [ -n "$MAIL_FROM" ]; then
echo "From: $MAIL_FROM"
fi
echo "To: $MAIL_TO" echo "To: $MAIL_TO"
echo "Subject: $subject" echo "Subject: $subject"
echo "Content-Type: $contenttype" echo "Content-Type: $contenttype"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment