Under check_mtree, invoke mtree with -L if check_mtree_follow_symlinks is set.
Apparently mtree -L is imperfect, but it is far better than the lack thereof if symlinks are involved reaching files mtree verifies.
This commit is contained in:
parent
e6eebcadf1
commit
687107d3c0
@ -1,4 +1,4 @@
|
||||
# $NetBSD: security.conf,v 1.9 2003/02/13 01:55:10 jhawk Exp $
|
||||
# $NetBSD: security.conf,v 1.10 2003/02/13 02:42:07 jhawk Exp $
|
||||
#
|
||||
# /etc/defaults/security.conf --
|
||||
# default configuration of /etc/security.conf
|
||||
@ -28,6 +28,8 @@ backup_dir=/var/backups
|
||||
backup_uses_rcs=YES
|
||||
pkgdb_dir=/var/db/pkg
|
||||
|
||||
check_mtree_follow_symlinks=NO
|
||||
|
||||
check_passwd_nowarn_shells="/sbin/nologin /usr/libexec/uucp/uucico"
|
||||
check_passwd_nowarn_users=""
|
||||
check_passwd_permit_star=NO
|
||||
|
11
etc/security
11
etc/security
@ -1,6 +1,6 @@
|
||||
#!/bin/sh -
|
||||
#
|
||||
# $NetBSD: security,v 1.81 2003/02/13 01:55:10 jhawk Exp $
|
||||
# $NetBSD: security,v 1.82 2003/02/13 02:42:06 jhawk Exp $
|
||||
# from: @(#)security 8.1 (Berkeley) 6/9/93
|
||||
#
|
||||
|
||||
@ -741,9 +741,14 @@ fi
|
||||
# the mtree(8) manual page.
|
||||
#
|
||||
if checkyesno check_mtree; then
|
||||
if checkyesno check_mtree_follow_symlinks; then
|
||||
check_mtree_flags="-L"
|
||||
else
|
||||
check_mtree_flags=""
|
||||
fi
|
||||
for file in $special_files; do
|
||||
[ ! -s $file ] && continue
|
||||
mtree -e -l -p / -f $file
|
||||
mtree -e -l -p / $check_mtree_flags -f $file
|
||||
done > $OUTPUT
|
||||
if [ -s $OUTPUT ]; then
|
||||
printf "\nChecking special files and directories.\n"
|
||||
@ -753,7 +758,7 @@ if checkyesno check_mtree; then
|
||||
for file in /etc/mtree/*.secure; do
|
||||
[ $file = '/etc/mtree/*.secure' ] && continue
|
||||
tree=`sed -n -e '3s/.* //p' -e 3q $file`
|
||||
mtree -f $file -p $tree > $TMP1
|
||||
mtree $check_mtree_flags -f $file -p $tree > $TMP1
|
||||
if [ -s $TMP1 ]; then
|
||||
printf "\nChecking $tree:\n"
|
||||
cat $TMP1
|
||||
|
Loading…
Reference in New Issue
Block a user