diff options
Diffstat (limited to 'debian/local/sendmail.in')
| -rw-r--r-- | debian/local/sendmail.in | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/debian/local/sendmail.in b/debian/local/sendmail.in index 3ade92a..36ccc7f 100644 --- a/debian/local/sendmail.in +++ b/debian/local/sendmail.in @@ -18,6 +18,15 @@ set -e; DEBUG=0; +# LSB compliance (kinda) +if [ -f /lib/lsb/init-functions ]; then + . /lib/lsb/init-functions; +else + log_begin_msg() { echo "$@"; }; + log_success_msg() { echo "$@"; }; + log_warning_msg() { echo "$@"; }; + fi; + #------------------------------------------------------------------------------ # Parameters for the sendmail daemon # Do *NOT* touch these lines, instead, edit /etc/mail/sendmail.conf @@ -95,7 +104,7 @@ Get_Parameters () { --make-pidfile \ --exec $MTA_DAEMON \ --startas $MTA_COMMAND \ - --start"; + --start"; STOP_MTAQ_CMD="start-stop-daemon \ --pidfile $MTAQ_PIDFILE \ --name sendmail-mta \ @@ -121,9 +130,6 @@ Get_Parameters () { NAME='sendmail'; FLAGS='defaults 50'; - # Support for coexistance with smtpd package - SMTPD='/usr/sbin/smtpd'; - # Sanitize some keyword entries DAEMON_MODE=$(echo "$DAEMON_MODE" | tr '[:upper:]' '[:lower:]'); QUEUE_MODE=$(echo "$QUEUE_MODE" | tr '[:upper:]' '[:lower:]'); @@ -168,7 +174,7 @@ start_mta () { # # If already running, don't start it... if is_running mta; then - echo 'MTA is already running.'; + log_warning_msg 'MTA is already running.'; return; fi; # @@ -239,7 +245,7 @@ start_msp () { # # If already running, don't start it... if is_running msp; then - echo 'MSP is already running.'; + log_warning_msg 'MSP is already running.'; return; fi; # @@ -847,9 +853,6 @@ daemon_check () { echo 'sendmail has not been configured, not started.'; echo 'To configure sendmail, type sendmailconfig'; exit 1; - elif [ -x $SMTPD ]; then - echo 'sendmail mta daemon not needed, not started.'; - exit 0; fi; MTAL_PARMS="$MTA_A $MTAL_L"; @@ -941,7 +944,7 @@ clean_queues () { done # rename tf files to be qf if the qf does not exist for tffile in $QUEUE/tf*; do - qffile=`echo "$tffile" | sed 's/t/q/'` + qffile=`echo "$tffile" | sed 's/\/tf\([[:alnum:]]*\)$/\/qf\1/'` if [ -r "$tffile" ] && [ ! -f "$qffile" ]; then if [ ! -z "$QUIET" ]; then echo -n "<recovering: $tffile> "; fi @@ -953,14 +956,15 @@ clean_queues () { done # remove df files with no corresponding qf files for dffile in $QUEUE/df*; do - qffile=`echo "$dffile" | sed 's/d/q/'` + qffile=`echo "$dffile" | sed 's/\/df\([[:alnum:]]*\)$/\/qf\1/'` + Dffile=`echo "$dffile" | sed 's/\/df\([[:alnum:]]*\)$/\/Df\1/'` if [ -r "$dffile" ] && [ ! -f "$qffile" ]; then if [ ! -s "$dffile" ]; then rm -f "$dffile" else if [ ! -z "$QUIET" ]; then echo -n "<incomplete: $dffile> "; fi - mv "$dffile" `echo $dffile | sed 's/d/D/'` + mv "$dffile" "$Dffile"; fi fi done @@ -1097,7 +1101,7 @@ case "$1" in $0 reload; fi; ;; - + reload|force-reload) echo -n 'Reloading Mail Transport Agent configuration: sendmail'; reload_sendmail; |