diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-04-29 13:05:34 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-04-29 13:05:34 +0000 |
| commit | 61b1a82100f42c5503edf047d592e880d99e1a99 (patch) | |
| tree | 2659511a962b904eb93749b9f4a13370a37b9b93 | |
| parent | a6eead001dfb0337410c174072522beab0f4f30c (diff) | |
Delete invocation of mailq(1) that was present for historical reasons.
On a real mailserver, it's too noisy and may be a privacy concern.
On a machine that's not a mailserver, it's pointless.
Besides, Theo points out that running subsystems that potentially
parse untrusted user data daily, at a predictable time, as root
is not a very good idea in the first place.
Suggested by millert@; gilles@ matthieu@ deraadt@ sthen@ agree
| -rw-r--r-- | etc/daily | 9 | ||||
| -rw-r--r-- | share/man/man8/daily.8 | 8 |
2 files changed, 3 insertions, 14 deletions
diff --git a/etc/daily b/etc/daily index 9457ba3bf0f..9a299e34e7e 100644 --- a/etc/daily +++ b/etc/daily @@ -1,5 +1,5 @@ # -# $OpenBSD: daily,v 1.87 2016/04/01 08:20:27 ajacoutot Exp $ +# $OpenBSD: daily,v 1.88 2016/04/29 13:05:33 schwarze Exp $ # From: @(#)daily 8.2 (Berkeley) 1/25/94 # # For local additions, create the file /etc/daily.local. @@ -140,13 +140,6 @@ else dump w | grep -vB1 ^Dump fi -# The first two regular expressions handle sendmail, the third postfix. -# When the queue is empty, smtpd(8) and exim -bp keep silent. -next_part "mail:" -mailq | grep -v -e "^/var/spool/mqueue is empty$" \ - -e "^[[:blank:]]*Total requests: 0$" \ - -e "^Mail queue is empty$" - next_part "network:" if [ "X$VERBOSESTATUS" != X0 ]; then netstat -ivn diff --git a/share/man/man8/daily.8 b/share/man/man8/daily.8 index d7cd0d7bb4e..9fb421de076 100644 --- a/share/man/man8/daily.8 +++ b/share/man/man8/daily.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: daily.8,v 1.23 2016/01/28 15:57:01 schwarze Exp $ +.\" $OpenBSD: daily.8,v 1.24 2016/04/29 13:05:33 schwarze Exp $ .\" .\" Copyright (c) 2003 Jason McIntyre <jmc@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 28 2016 $ +.Dd $Mdocdate: April 29 2016 $ .Dt DAILY 8 .Os .Sh NAME @@ -120,9 +120,6 @@ Reports on the amount of disk used/available via Reports on which file systems need to be dumped via .Xr dump 8 . .It -Reports on the status of the mail queue via -.Xr mailq 8 . -.It Reports networking statistics via .Xr netstat 1 . .It @@ -266,7 +263,6 @@ Root .Xr cron 8 , .Xr dump 8 , .Xr fsck 8 , -.Xr mailq 8 , .Xr makewhatis 8 , .Xr sa 8 , .Xr security 8 , |