Use OpenBSD's glob in OpenSSH.
authorPeter Avalos <pavalos@dragonflybsd.org>
Thu, 19 May 2011 00:56:40 +0000 (14:56 -1000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Thu, 19 May 2011 00:56:40 +0000 (14:56 -1000)
This fixes a bus error caused by globbing in the ssh utils (specifically
'ls *' in sftp).

crypto/openssh/ssh_namespace.h
secure/lib/libssh/Makefile

index 47f10f8..7169aeb 100644 (file)
 #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
index 3679545..6beb4a8 100644 (file)
@@ -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