"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "scripts/msmtpq/msmtpq" between
msmtp-1.8.8.tar.xz and msmtp-1.8.10.tar.xz

About: msmtp is an SMTP client with a sendmail compatible interface. It can be used with Mutt and other mail user agents.

msmtpq  (msmtp-1.8.8.tar.xz):msmtpq  (msmtp-1.8.10.tar.xz)
skipping to change at line 292 skipping to change at line 292
[ "$EMAIL_CONN_TEST" != 'x' ] && \ [ "$EMAIL_CONN_TEST" != 'x' ] && \
[ -z "$EMAIL_CONN_NOTEST" ] && { # do connection test [ -z "$EMAIL_CONN_NOTEST" ] && { # do connection test
connect_test || { connect_test || {
log "mail [ $2 ] [ $1 ] from queue ; couldn't be sent - host not connect ed" log "mail [ $2 ] [ $1 ] from queue ; couldn't be sent - host not connect ed"
return return
} }
} }
if "$MSMTP" $(< "${FQP}.msmtp") < "${FQP}.mail" ; then # this mail goes out the door if "$MSMTP" $(< "${FQP}.msmtp") < "${FQP}.mail" ; then # this mail goes out the door
log "mail [ $2 ] [ $1 ] from queue ; send was successful ; purged from que ue" # good news to user log "mail [ $2 ] [ $1 ] from queue ; send was successful ; purged from que ue" # good news to user
'rm' -f "${FQP}.*" # nuke both queue mail files 'rm' -f "${FQP}".* # nuke both queue mail files
ALT='t' # set queue changed flag ALT='t' # set queue changed flag
else # send was unsuccessful else # send was unsuccessful
RC=$? # take msmtp exit code RC=$? # take msmtp exit code
log "mail [ $2 ] [ $1 ] from queue ; send failed ; msmtp rc = $RC" # bad n ews ... log "mail [ $2 ] [ $1 ] from queue ; send failed ; msmtp rc = $RC" # bad n ews ...
fi fi
return $RC # func returns exit code return $RC # func returns exit code
else # corresponding MSF file not found else # corresponding MSF file not found
log "preparing to send .mail file [ $1 ] [ ${FQP}.mail ] but"\ log "preparing to send .mail file [ $1 ] [ ${FQP}.mail ] but"\
" corresponding .msmtp file [ ${FQP}.msmtp ] was not found in queue"\ " corresponding .msmtp file [ ${FQP}.msmtp ] was not found in queue"\
' skipping this mail ; this is worth looking into' # give user the b ad news ' skipping this mail ; this is worth looking into' # give user the b ad news
skipping to change at line 503 skipping to change at line 503
[ -z "$EMAIL_CONN_NOTEST" ] && { # do connection test [ -z "$EMAIL_CONN_NOTEST" ] && { # do connection test
connect_test || { connect_test || {
log "mail for [ $* ] : couldn't be sent - host not connected" log "mail for [ $* ] : couldn't be sent - host not connected"
enqueue_mail "$@" # enqueue the mail enqueue_mail "$@" # enqueue the mail
return return
} }
} }
if $MSMTP "$@" < "${FQP}.mail" > /dev/null ; then # send mail using queue .mail fil if $MSMTP "$@" < "${FQP}.mail" > /dev/null ; then # send mail using queue .mail fil
log "mail for [ $* ] : send was successful" # log it log "mail for [ $* ] : send was successful" # log it
'rm' -f "${FQP}.*" # remove all queue mail files .mail & .msmt p file 'rm' -f "${FQP}".* # remove all queue mail files .mail & .msmt p file
run_queue 'sm' # run/flush any other mails in queue run_queue 'sm' # run/flush any other mails in queue
else # send failed - the mail stays in the queue else # send failed - the mail stays in the queue
log "mail for [ $* ] : send was unsuccessful ; msmtp exit code was $?"\ log "mail for [ $* ] : send was unsuccessful ; msmtp exit code was $?"\
"enqueued mail as : [ $ID ] ( $* )" # (queue .mail file is already th ere) "enqueued mail as : [ $ID ] ( $* )" # (queue .mail file is already th ere)
fi fi
} }
# #
## -- entry point ## -- entry point
# #
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)