[src/trunk]: src/crypto/external/bsd/openssh/dist add more blacklist rejectio...

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

details:   https://anonhg.NetBSD.org/src/rev/68ed07138c71
branches:  trunk
changeset: 813260:68ed07138c71
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 23 00:03:30 2016 +0000

description:
add more blacklist rejection points.

diffstat:

 crypto/external/bsd/openssh/dist/auth-pam.c |  4 +++-
 crypto/external/bsd/openssh/dist/auth.c     |  5 +++--
 crypto/external/bsd/openssh/dist/auth1.c    |  5 +++--
 crypto/external/bsd/openssh/dist/pfilter.c  |  1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diffs (89 lines):

diff -r 71ca86c12170 -r 68ed07138c71 crypto/external/bsd/openssh/dist/auth-pam.c
--- a/crypto/external/bsd/openssh/dist/auth-pam.c       Fri Jan 22 23:59:44 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-pam.c       Sat Jan 23 00:03:30 2016 +0000
@@ -50,7 +50,7 @@
 /*
  * NetBSD local changes
  */
-__RCSID("$NetBSD: auth-pam.c,v 1.7 2015/07/03 00:59:59 christos Exp $");
+__RCSID("$NetBSD: auth-pam.c,v 1.8 2016/01/23 00:03:30 christos Exp $");
 #undef USE_POSIX_THREADS /* Not yet */
 #define HAVE_SECURITY_PAM_APPL_H
 #define HAVE_PAM_GETENVLIST
@@ -114,6 +114,7 @@
 #include "ssh-gss.h"
 #endif
 #include "monitor_wrap.h"
+#include "pfilter.h"
 
 extern ServerOptions options;
 extern Buffer loginmsg;
@@ -809,6 +810,7 @@
                                free(msg);
                                return (0);
                        }
+                       pfilter_notify(1);
                        error("PAM: %s for %s%.100s from %.100s", msg,
                            sshpam_authctxt->valid ? "" : "illegal user ",
                            sshpam_authctxt->user,
diff -r 71ca86c12170 -r 68ed07138c71 crypto/external/bsd/openssh/dist/auth.c
--- a/crypto/external/bsd/openssh/dist/auth.c   Fri Jan 22 23:59:44 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/auth.c   Sat Jan 23 00:03:30 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth.c,v 1.15 2015/08/21 08:20:59 christos Exp $       */
+/*     $NetBSD: auth.c,v 1.16 2016/01/23 00:03:30 christos Exp $       */
 /* $OpenBSD: auth.c,v 1.113 2015/08/21 03:42:19 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth.c,v 1.15 2015/08/21 08:20:59 christos Exp $");
+__RCSID("$NetBSD: auth.c,v 1.16 2016/01/23 00:03:30 christos Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -656,6 +656,7 @@
 
        pw = getpwnam(user);
        if (pw == NULL) {
+               pfilter_notify(1);
                logit("Invalid user %.100s from %.100s",
                    user, get_remote_ipaddr());
                return (NULL);
diff -r 71ca86c12170 -r 68ed07138c71 crypto/external/bsd/openssh/dist/auth1.c
--- a/crypto/external/bsd/openssh/dist/auth1.c  Fri Jan 22 23:59:44 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/auth1.c  Sat Jan 23 00:03:30 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth1.c,v 1.12 2015/07/03 00:59:59 christos Exp $      */
+/*     $NetBSD: auth1.c,v 1.13 2016/01/23 00:03:30 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.12 2015/07/03 00:59:59 christos Exp $");
+__RCSID("$NetBSD: auth1.c,v 1.13 2016/01/23 00:03:30 christos Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 
@@ -376,6 +376,7 @@
                        char *msg;
                        size_t len;
 
+                       pfilter_notify(1);
                        error("Access denied for user %s by PAM account "
                            "configuration", authctxt->user);
                        len = buffer_len(&loginmsg);
diff -r 71ca86c12170 -r 68ed07138c71 crypto/external/bsd/openssh/dist/pfilter.c
--- a/crypto/external/bsd/openssh/dist/pfilter.c        Fri Jan 22 23:59:44 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/pfilter.c        Sat Jan 23 00:03:30 2016 +0000
@@ -1,4 +1,5 @@
 #include "namespace.h"
+#include "includes.h"
 #include "ssh.h"
 #include "packet.h"
 #include "log.h"