--- /etc/periodic/security/800.loginfail	Mon Feb 25 06:53:47 2002
+++ /etc/periodic/security/800.loginfail	Sun Mar 10 16:04:21 2002
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.1.2.1 2002/02/25 10:53:47 cjc Exp $
+# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.1.2.2 2002/03/10 15:18:47 aeonflux Exp $
 #
 
 # Show login failures
@@ -47,6 +47,7 @@
 	    sort -t. -r -n +1 -2 |
 	    xargs zcat -f
 	[ -f ${LOG}/messages ] && cat $LOG/messages
+	[ -f ${LOG}/auth.log ] && cat $LOG/auth.log
 }
 
 case "$daily_status_security_loginfail_enable" in
@@ -54,6 +55,16 @@
 	echo ""
 	echo "${host} login failures:"
 	n=$(catmsgs | grep -ia "^$yesterday.*login failure" |
+	    tee /dev/stderr | wc -l)
+	[ $n -gt 0 ] && rc=1 || rc=0;;
+    *)	rc=0;;
+esac
+
+case "$daily_status_security_sshloginfail_enable" in
+    [Yy][Ee][Ss])
+	echo ""
+	echo "${host} SSH login failures:"
+	n=$(catmsgs | grep -ia "^$yesterday.*failed password" |
 	    tee /dev/stderr | wc -l)
 	[ $n -gt 0 ] && rc=1 || rc=0;;
     *)	rc=0;;

--- /etc/defaults/periodic.conf	Wed Feb 27 22:31:47 2002
+++ /etc/defaults/periodic.conf	Sun Mar 10 16:08:02 2002
@@ -10,7 +10,7 @@
 # values set in this file.  This eases the upgrade path when defaults
 # are changed and new features are added.
 #
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.7.2.9 2002/02/25 10:53:12 cjc Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.7.2.10 2002/03/10 16:05:12 aeonflux Exp $
 #
 
 # What files override these defaults ?
@@ -169,6 +169,7 @@
 
 # 800.loginfail
 daily_status_security_loginfail_enable="YES"
+daily_status_security_sshloginfail_enable="YES"
 
 # 900.tcpwrap
 daily_status_security_tcpwrap_enable="YES"
