svn commit: r195802 - in stable/7: crypto/openssh secure/lib/libssh

[John Baldwin]

Author: jhb
Date: Tue Jul 21 13:45:40 2009
New Revision: 195802
URL: http://svn.freebsd.org/changeset/base/195802

Log:
  Revert to using the userland closefrom() stub instead of the system call
  to give a longer grace time where newer ssh binaries work with older
  kernels.
  
  Requested by:	obrien
  Approved by:	des

Modified:
  stable/7/crypto/openssh/   (props changed)
  stable/7/crypto/openssh/config.h
  stable/7/crypto/openssh/ssh_namespace.h
  stable/7/secure/lib/libssh/   (props changed)
  stable/7/secure/lib/libssh/Makefile

Modified: stable/7/crypto/openssh/config.h
==============================================================================
--- stable/7/crypto/openssh/config.h	Tue Jul 21 12:32:46 2009	(r195801)
+++ stable/7/crypto/openssh/config.h	Tue Jul 21 13:45:40 2009	(r195802)
@@ -211,7 +211,7 @@
 #define HAVE_CLOCK_T 1
 
 /* Define to 1 if you have the `closefrom' function. */
-#define HAVE_CLOSEFROM 1
+/* #undef HAVE_CLOSEFROM */
 
 /* Define if gai_strerror() returns const char * */
 #define HAVE_CONST_GAI_STRERROR_PROTO 1

Modified: stable/7/crypto/openssh/ssh_namespace.h
==============================================================================
--- stable/7/crypto/openssh/ssh_namespace.h	Tue Jul 21 12:32:46 2009	(r195801)
+++ stable/7/crypto/openssh/ssh_namespace.h	Tue Jul 21 13:45:40 2009	(r195802)
@@ -154,6 +154,7 @@
 #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

Modified: stable/7/secure/lib/libssh/Makefile
==============================================================================
--- stable/7/secure/lib/libssh/Makefile	Tue Jul 21 12:32:46 2009	(r195801)
+++ stable/7/secure/lib/libssh/Makefile	Tue Jul 21 13:45:40 2009	(r195802)
@@ -19,7 +19,7 @@ SRCS=	acss.c authfd.c authfile.c bufaux.
 # compiled directly into sshd instead.
 
 # Portability layer
-SRCS+=	bsd-arc4random.c bsd-misc.c fmt_scaled.c \
+SRCS+=	bsd-arc4random.c bsd-closefrom.c bsd-misc.c fmt_scaled.c \
 	getrrsetbyname.c openssl-compat.c port-tun.c strtonum.c \
 	vis.c xcrypt.c xmmap.c
 # FreeBSD additions