diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-01-10 00:17:34 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-01-10 00:17:34 +0000 |
| commit | a9cdb957a54882da3abfdeb3074ee5f01940171c (patch) | |
| tree | 9948e35da185fa71a6bb362c8cc768d938c50b0c /mail-mta/qmail | |
| parent | Added ~sparc keyword as it went missing in the version bump. (Manifest recommit) (diff) | |
| download | gentoo-2-a9cdb957a54882da3abfdeb3074ee5f01940171c.tar.gz gentoo-2-a9cdb957a54882da3abfdeb3074ee5f01940171c.tar.bz2 gentoo-2-a9cdb957a54882da3abfdeb3074ee5f01940171c.zip | |
Bug #77159 redux.
Diffstat (limited to 'mail-mta/qmail')
| -rw-r--r-- | mail-mta/qmail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-mta/qmail/files/config-sanity-check | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog index f06422d5c4f7..e448e552bfc1 100644 --- a/mail-mta/qmail/ChangeLog +++ b/mail-mta/qmail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-mta/qmail # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.26 2005/01/09 13:31:15 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.27 2005/01/10 00:17:34 robbat2 Exp $ + + 09 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> + files/config-sanity-check: + Bug #77159 redux. 09 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> files/1.03-r15/Makefile-relaymxlookup.patch, diff --git a/mail-mta/qmail/files/config-sanity-check b/mail-mta/qmail/files/config-sanity-check index d0403ecdff0e..848d12a2b7c8 100644 --- a/mail-mta/qmail/files/config-sanity-check +++ b/mail-mta/qmail/files/config-sanity-check @@ -1,6 +1,6 @@ #!/bin/sh # Configuration Sanity Checking for qmail -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/config-sanity-check,v 1.2 2004/07/18 03:29:51 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/config-sanity-check,v 1.3 2005/01/10 00:17:34 robbat2 Exp $ # This is intended solely to stop qmail eating up all your hard disk space with logs CONFIG_SANITY_GOOD=1 @@ -12,11 +12,13 @@ if [ -z "${QMAILDUID}" -o -z "${NOFILESGID}" -o -z "${SERVICE}" -o -z "${QMAILLU fi if [ -z "${LOG_OPTS}" -o -z "${LOG_DEST}" ]; then + echo "LOG_OPTS: ${LOG_OPTS}" + echo "LOG_DEST: ${LOG_DEST}" echo "Error in logging setup!" CONFIG_SANITY_GOOD=0 fi -if [ ! -f ${QMAIL_CONTROLDIR}/rcpthosts -a -z "${QMAIL_DISABLE_SANITY_CHECK}" -a "${SERVICE}" = "smtp" ]; then +if [ "${SERVICE}" = "smtp" -a ! -f ${QMAIL_CONTROLDIR}/rcpthosts -a -z "${QMAIL_DISABLE_SANITY_CHECK}" ]; then echo "No /var/qmail/control/rcpthosts!" echo "Refusing to start SMTP listener because it'll create an open relay" CONFIG_SANITY_GOOD=0 @@ -28,8 +30,8 @@ if [ "${SERVICE}" != "send" -a ! -f "${TCPSERVER_RULESCDB}" ]; then fi if [ ! "${CONFIG_SANITY_GOOD}" -eq "1" ]; then - echo "Some error detected, sleeping for 30 seconds for safety" - sleep 30s + echo "Some error detected in ${SERVICE}, sleeping for 90 seconds for safety" + sleep 90s exit 1 fi |