Module Name: src
Committed By: christos
Date: Mon Jan 26 03:57:17 UTC 2015
Modified Files:
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/dist: pfilter.c
Log Message:
don't use blacklist if we are crunched.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/dist/pfilter.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.11 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.12
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.11 Sun Jan 25 10:52:44 2015
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Sun Jan 25 22:57:17 2015
@@ -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 @@ DPADD+= ${LIBCRYPT} ${LIBUTIL}
LDADD+= -lwrap
DPADD+= ${LIBWRAP}
+.ifdef CRUNCHEDPROG
+CPPFLAGS+=-DSMALL
+.else
LDADD+= -lblacklist
DPADD+= ${LIBBLACKLIST}
+.endif
Index: src/crypto/external/bsd/openssh/dist/pfilter.c
diff -u src/crypto/external/bsd/openssh/dist/pfilter.c:1.1 src/crypto/external/bsd/openssh/dist/pfilter.c:1.2
--- src/crypto/external/bsd/openssh/dist/pfilter.c:1.1 Sun Jan 25 10:52:44 2015
+++ src/crypto/external/bsd/openssh/dist/pfilter.c Sun Jan 25 22:57:17 2015
@@ -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 @@ pfilter_notify(int a)
// XXX: 3?
fd = packet_connection_is_on_socket() ? packet_get_connection_in() : 3;
(void)blacklist_r(blstate, a, fd, "ssh");
+#else
+ __USE(a);
+#endif
}
