summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2014-03-23 22:08:16 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2014-03-23 22:08:16 +0000
commit40201a915201e06db91c83a54033b2e0d967f4ed (patch)
tree23d34713f647471e1808a3c21ff728e86d95f804
parent646ec145f158b02757cfd5cd123d9f5fb5b51678 (diff)
don't check ftpusers in security(8), from gsoares@, ok afresh1@ schwarze@
-rw-r--r--libexec/security/security17
1 files changed, 1 insertions, 16 deletions
diff --git a/libexec/security/security b/libexec/security/security
index 4515d837484..ac0cb4f9aec 100644
--- a/libexec/security/security
+++ b/libexec/security/security
@@ -1,6 +1,6 @@
#!/usr/bin/perl -T
-# $OpenBSD: security,v 1.23 2013/03/21 09:37:37 sthen Exp $
+# $OpenBSD: security,v 1.24 2014/03/23 22:08:15 sthen Exp $
#
# Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
# Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
@@ -287,20 +287,6 @@ sub check_ksh {
}
}
-# Root and uucp should both be in /etc/ftpusers.
-sub check_ftpusers {
- my $filename = '/etc/ftpusers';
- nag !(open my $fh, '<', $filename), "open: $filename: $!" and return;
- my %banned = qw(root 1 uucp 1);
- while (<$fh>) {
- chomp;
- delete $banned{$_};
- }
- nag 1, "\u$_ not listed in $filename file."
- foreach sort keys %banned;
- close $fh;
-}
-
# Uudecode should not be in the /etc/mail/aliases file.
sub check_mail_aliases {
my $filename = '/etc/mail/aliases';
@@ -899,7 +885,6 @@ check_ksh(check_sh);
open STDERR, '>&', $olderr;
$check_title = "Checking configuration files:";
-check_ftpusers;
check_mail_aliases;
check_hostname_if;
check_hosts_equiv;