From 11606d89a75b84f614d3a84cdcf081204a864c09 Mon Sep 17 00:00:00 2001 From: "Richard A Nelson (Rick)" Date: Mon, 25 Apr 2005 02:30:00 +0000 Subject: Imported Debian patch 8.13.4-2 --- debian/local/sendmail.in | 10 +++++----- debian/local/update_sendmail | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'debian/local') diff --git a/debian/local/sendmail.in b/debian/local/sendmail.in index c1a86cb..3ade92a 100644 --- a/debian/local/sendmail.in +++ b/debian/local/sendmail.in @@ -73,11 +73,6 @@ Get_Parameters () { . @sysconfdir@/mail/sendmail.conf; fi; - # Sanitize some keyword entries - DAEMON_MODE=$(echo "$DAEMON_MODE" | tr '[:upper:]' '[:lower:]'); - QUEUE_MODE=$(echo "$QUEUE_MODE" | tr '[:upper:]' '[:lower:]'); - MSP_MODE=$(echo "$MSP_MODE" | tr '[:upper:]' '[:lower:]'); - # These can't be user customized SM_Get_Parameters='yes'; PATH='/bin:/usr/bin:/sbin:/usr/sbin'; @@ -129,6 +124,11 @@ Get_Parameters () { # 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:]'); + MSP_MODE=$(echo "$MSP_MODE" | tr '[:upper:]' '[:lower:]'); + # See if we can share the listener and queue-runner daemon: # * Both must be in daemon mode # * They must have the same (possibly empty) parameters diff --git a/debian/local/update_sendmail b/debian/local/update_sendmail index 900044e..c0d80bb 100644 --- a/debian/local/update_sendmail +++ b/debian/local/update_sendmail @@ -54,6 +54,7 @@ if [ -x $sm_path/update_conf ]; then # sure it is compatible with the current executables. if [ -x $sm_path/update_mc ]; then $sm_path/update_mc || changed=1; + rm -f /etc/mail/databases || true; $sm_path/parse_mc || true; fi; -- cgit v1.2.3