diff options
| author |   schwarze <schwarze@openbsd.org> | 2015-03-27 13:26:19 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2015-03-27 13:26:19 +0000 |
| commit | 46d53d6e458e6b1e5ed45c9e19fadb15dd00077f (patch) | |
| tree | 10d06abc5df66c66125d7da0598e3db0b9e94ec0 /libexec/security | |
| parent | If /etc/passwd contains incomplete lines ending before the (diff) | |
| download | wireguard-openbsd-46d53d6e458e6b1e5ed45c9e19fadb15dd00077f.tar.xz wireguard-openbsd-46d53d6e458e6b1e5ed45c9e19fadb15dd00077f.zip | |
In mount(8) output, do not misparse lines where fs_spec ends with the
two characters "on", which can for example happen for NFS mounts.
Patch from Lauri Tirkkonen <lotheac at iki dot fi> on bugs@.
Diffstat (limited to 'libexec/security')
| -rw-r--r-- | libexec/security/security | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/security/security b/libexec/security/security index 2c1ef689d57..ef11c0c85e3 100644 --- a/libexec/security/security +++ b/libexec/security/security @@ -1,6 +1,6 @@ #!/usr/bin/perl -T -# $OpenBSD: security,v 1.33 2015/03/27 12:33:36 schwarze Exp $ +# $OpenBSD: security,v 1.34 2015/03/27 13:26:19 schwarze Exp $ # # Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com> @@ -537,7 +537,7 @@ sub find_special_files { "cannot spawn mount: $!" and return; while (<$fh>) { - my ($path, $type) = /on\s+(.*?)\s+type\s+(\w+)/; + my ($path, $type) = /\son\s+(.*?)\s+type\s+(\w+)/; $skip{$path} = 1 if $path && ($type =~ /^(?:a|nnp|proc)fs$/ || !/\(.*local.*\)/); } |