diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2014-01-22 00:21:18 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2014-01-22 00:21:18 +0000 |
| commit | 446a42e5f7ee4fa1cf899b4250aa68b5e39ce002 (patch) | |
| tree | f1d1d7294c34aa1208f8253af417724454c3050a /usr.sbin/smtpd | |
| parent | 17a9845a120b50421e5f393c539c2623e9e5818e (diff) | |
relax the cfg file secrecy check slightly to allow group readability
default permissions and mtree NOT changed.
prodded by benno, ok phessler benno jmatthew theo pelikan florian
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index d324964d25b..38d8062fe07 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.135 2013/12/26 17:25:32 eric Exp $ */ +/* $OpenBSD: parse.y,v 1.136 2014/01/22 00:21:17 henning Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -1451,8 +1451,8 @@ check_file_secrecy(int fd, const char *fname) log_warnx("warn: %s: owner not root or current user", fname); return (-1); } - if (st.st_mode & (S_IRWXG | S_IRWXO)) { - log_warnx("warn: %s: group/world readable/writeable", fname); + if (st.st_mode & (S_IWGRP | S_IXGRP | S_IRWXO)) { + log_warnx("%s: group writable or world read/writable", fname); return (-1); } return (0); |