[src/trunk]: src/crypto/external/bsd/openssh don't use blacklist if we are cr...

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

details:   https://anonhg.NetBSD.org/src/rev/c9aa35875a53
branches:  trunk
changeset: 335846:c9aa35875a53
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 26 03:57:17 2015 +0000

description:
don't use blacklist if we are crunched.

diffstat:

 crypto/external/bsd/openssh/bin/sshd/Makefile |  6 +++++-
 crypto/external/bsd/openssh/dist/pfilter.c    |  8 ++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diffs (53 lines):

diff -r da58f8c4710b -r c9aa35875a53 crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile     Mon Jan 26 02:31:52 2015 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile     Mon Jan 26 03:57:17 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2015/01/25 15:52:44 christos Exp $
+#      $NetBSD: Makefile,v 1.12 2015/01/26 03:57:17 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -69,5 +69,9 @@
 LDADD+=        -lwrap
 DPADD+=        ${LIBWRAP}
 
+.ifdef CRUNCHEDPROG
+CPPFLAGS+=-DSMALL
+.else
 LDADD+=        -lblacklist
 DPADD+=        ${LIBBLACKLIST}
+.endif
diff -r da58f8c4710b -r c9aa35875a53 crypto/external/bsd/openssh/dist/pfilter.c
--- a/crypto/external/bsd/openssh/dist/pfilter.c        Mon Jan 26 02:31:52 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/pfilter.c        Mon Jan 26 03:57:17 2015 +0000
@@ -5,17 +5,22 @@
 #include "pfilter.h"
 #include <blacklist.h>
 
+#ifndef SMALL
 static struct blacklist *blstate;
+#endif
 
 void
 pfilter_init()
 {
+#ifndef SMALL
        blstate = blacklist_open();
+#endif
 }
 
 void
 pfilter_notify(int a)
 {
+#ifndef SMALL
        int fd;
        if (blstate == NULL)
                pfilter_init();
@@ -24,4 +29,7 @@
        // XXX: 3?
        fd = packet_connection_is_on_socket() ? packet_get_connection_in() : 3;
        (void)blacklist_r(blstate, a, fd, "ssh");
+#else
+       __USE(a);
+#endif
 }