summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crypto/openssh/config.h2
-rw-r--r--crypto/openssh/ssh_namespace.h1
-rw-r--r--secure/lib/libssh/Makefile2
3 files changed, 2 insertions, 3 deletions
diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h
index d465969..d07ee69 100644
--- a/crypto/openssh/config.h
+++ b/crypto/openssh/config.h
@@ -211,7 +211,7 @@
#define HAVE_CLOCK_T 1
/* Define to 1 if you have the `closefrom' function. */
-/* #undef HAVE_CLOSEFROM */
+#define HAVE_CLOSEFROM 1
/* Define if gai_strerror() returns const char * */
#define HAVE_CONST_GAI_STRERROR_PROTO 1
diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
index a51e132..8fdf708 100644
--- a/crypto/openssh/ssh_namespace.h
+++ b/crypto/openssh/ssh_namespace.h
@@ -153,7 +153,6 @@
#define ciphers_valid ssh_ciphers_valid
#define cleanhostname ssh_cleanhostname
#define cleanup_exit ssh_cleanup_exit
-#define closefrom ssh_closefrom
#define colon ssh_colon
#define compat_cipher_proposal ssh_compat_cipher_proposal
#define compat_datafellows ssh_compat_datafellows
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 5a3659a..1bec2c1 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -19,7 +19,7 @@ SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
# compiled directly into sshd instead.
# Portability layer
-SRCS+= bsd-closefrom.c bsd-misc.c fmt_scaled.c getrrsetbyname.c \
+SRCS+= bsd-misc.c fmt_scaled.c getrrsetbyname.c \
openssl-compat.c port-tun.c strtonum.c vis.c xcrypt.c xmmap.c
# FreeBSD additions
SRCS+= version.c
OpenPOWER on IntegriCloud