From: Peter Avalos Date: Thu, 19 May 2011 00:56:40 +0000 (-1000) Subject: Use OpenBSD's glob in OpenSSH. X-Git-Tag: v2.12.0~596 X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/7b7cfea6910e087a3c0d5e254eac14fd8cbdc901 Use OpenBSD's glob in OpenSSH. This fixes a bus error caused by globbing in the ssh utils (specifically 'ls *' in sftp). --- diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h index 47f10f8c40..7169aebdd9 100644 --- a/crypto/openssh/ssh_namespace.h +++ b/crypto/openssh/ssh_namespace.h @@ -243,6 +243,8 @@ #define get_u32 ssh_get_u32 #define get_u64 ssh_get_u64 #define getrrsetbyname ssh_getrrsetbyname +#define glob ssh_glob +#define globfree ssh_globfree #define hash_buffer ssh_hash_buffer #define host_hash ssh_host_hash #define hostfile_read_key ssh_hostfile_read_key diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 3679545020..6beb4a859f 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -15,7 +15,7 @@ SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \ msg.c progressmeter.c dns.c entropy.c gss-genr.c umac.c jpake.c \ schnorr.c ssh-pkcs11.c # Portability layer -SRCS+= bsd-misc.c getrrsetbyname.c port-tun.c timingsafe_bcmp.c +SRCS+= bsd-misc.c getrrsetbyname.c glob.c port-tun.c timingsafe_bcmp.c # FreeBSD additions SRCS+= version.c