From 54e859f63de83d9e26c6db6b3f6c32bf2189f202 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 2 Mar 2008 21:52:27 +1100
Subject:  - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way
 we expect    either, so use our own.

---
 ChangeLog    | 6 +++++-
 configure.ac | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb6b43e0..0702b01d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20080302
+ - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect
+   either, so use our own.
+
 20080229
  - (dtucker) [openbsd-compat/bsd-poll.c] We don't check for select(2) in
    configure (and there's not much point, as openssh won't work without it)
@@ -3653,4 +3657,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4849 2008/02/29 11:53:40 djm Exp $
+$Id: ChangeLog,v 1.4850 2008/03/02 10:52:27 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index f8405432..017fd7e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.392 2008/02/28 12:16:04 dtucker Exp $
+# $Id: configure.ac,v 1.393 2008/03/02 10:52:28 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.392 $)
+AC_REVISION($Revision: 1.393 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -569,6 +569,7 @@ mips-sony-bsd|mips-sony-newsos4)
 	AC_DEFINE(SSH_TUN_FREEBSD, 1, [Open tunnel devices the FreeBSD way])
 	AC_CHECK_HEADER([net/if_tap.h], ,
 	    AC_DEFINE(SSH_TUN_NO_L2, 1, [No layer 2 tunnel support]))
+	AC_DEFINE(BROKEN_GLOB, 1, [FreeBSD glob does not do what we need])
 	;;
 *-*-bsdi*)
 	AC_DEFINE(SETEUID_BREAKS_SETUID)
-- 
cgit v1.2.3