summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2020-09-17 06:51:07 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2020-09-17 06:51:07 +0000
commitd06209afacc16d1d0bea5966d6e7827c2b8fbb58 (patch)
tree5ffb750ba0267bcb7fd35f17d0e0e16c98663168
parentacb9e6b38f7641e071bd548338ce93c9b3314e82 (diff)
afs, nnpfs, and procfs are no longer supported,
so stop looking for them in mount(8) output; no functional change intended; OK millert@
-rw-r--r--libexec/security/security6
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/security/security b/libexec/security/security
index cf6dfd7822d..abb257be930 100644
--- a/libexec/security/security
+++ b/libexec/security/security
@@ -1,6 +1,6 @@
#!/usr/bin/perl -T
-# $OpenBSD: security,v 1.39 2020/09/14 14:43:13 schwarze Exp $
+# $OpenBSD: security,v 1.40 2020/09/17 06:51:06 schwarze Exp $
#
# Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
# Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
@@ -540,9 +540,9 @@ sub find_special_files {
"cannot spawn mount: $!"
and return;
while (<$fh>) {
- my ($path, $type, $opt) = /\son\s+(.*?)\s+type\s+(\w+)(.*)/;
+ my ($path, $opt) = /\son\s+(.*?)\s+type\s+\w+(.*)/;
$skip{$path} = 1 if $path &&
- ($type =~ /^(?:a|nnp|proc)fs$/ || $opt !~ /local/ ||
+ ($opt !~ /local/ ||
($opt =~ /nodev/ && $opt =~ /nosuid/));
}
close_or_nag $fh, "mount" or return;