summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRobert Nagy <robert@cvs.openbsd.org>2011-07-07 05:00:20 +0000
committerRobert Nagy <robert@cvs.openbsd.org>2011-07-07 05:00:20 +0000
commitc1dcf3f893f7d82ee4251ddf444064533c928eb1 (patch)
treeba10f8a1ecc38dc2d79a75d2f66501c3e57f896c /etc
parent52a7a6177d1e801a397d38a244db1c62347435e5 (diff)
sendmail stalls for at least a minute if it cannot resolve or connect
to the machine's hostname either because there is a network problem or because /etc/hosts is wrong. while trying to resolve it also does not change it's process name so let's cope with that in the rc script
Diffstat (limited to 'etc')
-rw-r--r--etc/rc.d/sendmail6
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail
index 65450e39ce2..6959c4a198b 100644
--- a/etc/rc.d/sendmail
+++ b/etc/rc.d/sendmail
@@ -1,11 +1,13 @@
#!/bin/sh
#
-# $OpenBSD: sendmail,v 1.1 2011/07/06 18:55:36 robert Exp $
+# $OpenBSD: sendmail,v 1.2 2011/07/07 05:00:19 robert Exp $
daemon="/usr/sbin/sendmail"
. /etc/rc.d/rc.subr
-pexp="sendmail: accepting.*"
+pexp="(sendmail: accepting.*|${daemon} ${daemon_flags})"
+
+rc_bg=YES
rc_cmd $1