svn commit: r199131 - in head: crypto/openssh secure/lib/libssh

[Dag-Erling Smorgrav]

Author: des
Date: Tue Nov 10 09:45:43 2009
New Revision: 199131
URL: http://svn.freebsd.org/changeset/base/199131

Log:
  Fix globbing
  
  Noticed by:	delphij, David Cornejo <dave at dogwood.com>
  Forgotten by:	des

Modified:
  head/crypto/openssh/ssh_namespace.h
  head/secure/lib/libssh/Makefile

Modified: head/crypto/openssh/ssh_namespace.h
==============================================================================
--- head/crypto/openssh/ssh_namespace.h	Tue Nov 10 09:44:55 2009	(r199130)
+++ head/crypto/openssh/ssh_namespace.h	Tue Nov 10 09:45:43 2009	(r199131)
@@ -223,6 +223,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 host_hash				ssh_host_hash
 #define hostfile_read_key			ssh_hostfile_read_key
 #define hpdelim					ssh_hpdelim

Modified: head/secure/lib/libssh/Makefile
==============================================================================
--- head/secure/lib/libssh/Makefile	Tue Nov 10 09:44:55 2009	(r199130)
+++ head/secure/lib/libssh/Makefile	Tue Nov 10 09:45:43 2009	(r199131)
@@ -19,7 +19,7 @@ SRCS=	acss.c authfd.c authfile.c bufaux.
 # compiled directly into sshd instead.
 
 # Portability layer
-SRCS+=	bsd-misc.c fmt_scaled.c getrrsetbyname.c \
+SRCS+=	bsd-misc.c fmt_scaled.c getrrsetbyname.c glob.c \
 	openssl-compat.c port-tun.c strtonum.c vis.c xcrypt.c xmmap.c
 # FreeBSD additions
 SRCS+=	version.c