[src/trunk]: src/crypto/external/bsd/openssh/dist Also mark as bad attempts t...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3b3707912172
branches:  trunk
changeset: 336147:3b3707912172
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Feb 14 15:41:21 2015 +0000

description:
Also mark as bad attempts those who come in a bad users (Frank Kardel)

diffstat:

 crypto/external/bsd/openssh/dist/auth1.c |  6 ++++--
 crypto/external/bsd/openssh/dist/auth2.c |  6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (68 lines):

diff -r a2446329fe48 -r 3b3707912172 crypto/external/bsd/openssh/dist/auth1.c
--- a/crypto/external/bsd/openssh/dist/auth1.c  Sat Feb 14 13:43:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth1.c  Sat Feb 14 15:41:21 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth1.c,v 1.9 2014/10/19 16:30:58 christos Exp $       */
+/*     $NetBSD: auth1.c,v 1.10 2015/02/14 15:41:21 christos Exp $      */
 /* $OpenBSD: auth1.c,v 1.82 2014/07/15 15:54:14 millert Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth1.c,v 1.9 2014/10/19 16:30:58 christos Exp $");
+__RCSID("$NetBSD: auth1.c,v 1.10 2015/02/14 15:41:21 christos Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 
@@ -41,6 +41,7 @@
 #endif
 #include "monitor_wrap.h"
 #include "buffer.h"
+#include "pfilter.h"
 
 /* import */
 extern ServerOptions options;
@@ -445,6 +446,7 @@
        else {
                debug("do_authentication: invalid user %s", user);
                authctxt->pw = fakepw();
+               pfilter_notify(1);
        }
 
        /* Configuration may have changed as a result of Match */
diff -r a2446329fe48 -r 3b3707912172 crypto/external/bsd/openssh/dist/auth2.c
--- a/crypto/external/bsd/openssh/dist/auth2.c  Sat Feb 14 13:43:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2.c  Sat Feb 14 15:41:21 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth2.c,v 1.9 2014/10/19 16:30:58 christos Exp $       */
+/*     $NetBSD: auth2.c,v 1.10 2015/02/14 15:41:21 christos Exp $      */
 /* $OpenBSD: auth2.c,v 1.132 2014/07/15 15:54:14 millert Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2.c,v 1.9 2014/10/19 16:30:58 christos Exp $");
+__RCSID("$NetBSD: auth2.c,v 1.10 2015/02/14 15:41:21 christos Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
@@ -52,6 +52,7 @@
 #include "pathnames.h"
 #include "buffer.h"
 #include "canohost.h"
+#include "pfilter.h"
 
 #ifdef GSSAPI
 #include "ssh-gss.h"
@@ -256,6 +257,7 @@
                } else {
                        logit("input_userauth_request: invalid user %s", user);
                        authctxt->pw = fakepw();
+                       pfilter_notify(1);
                }
 #ifdef USE_PAM
                if (options.use_pam)