summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-01 20:29:10 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-01 20:29:10 +1000
commit096faecdea1e39ecace0b20f4e208bd7ec33f6d2 (patch)
tree7756d6d5fefe40aab00431d47075175a5641b9a1
parent0646ca6be81c4f0f619d92a4e5a041b58c79a221 (diff)
- (dtucker) [configure.ac includes.h openbsd-compat/glob.{c,h}] Explicitly
test for GLOB_NOMATCH and use our glob functions if it's not found. Stops sftp from segfaulting when attempting to get a nonexistent file on Cygwin (previous versions of OpenSSH didn't use the native glob). Partly from and tested by Corinna Vinschen.
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac6
-rw-r--r--includes.h3
-rw-r--r--openbsd-compat/glob.c3
-rw-r--r--openbsd-compat/glob.h3
5 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f10393f3c..0cbd4b627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,11 @@
19 sys/socket.h and unistd.h in various places 19 sys/socket.h and unistd.h in various places
20 - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Fix implict declaration 20 - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Fix implict declaration
21 warnings for binary_open and binary_close. Patch from Corinna Vinschen. 21 warnings for binary_open and binary_close. Patch from Corinna Vinschen.
22 - (dtucker) [configure.ac includes.h openbsd-compat/glob.{c,h}] Explicitly
23 test for GLOB_NOMATCH and use our glob functions if it's not found.
24 Stops sftp from segfaulting when attempting to get a nonexistent file on
25 Cygwin (previous versions of OpenSSH didn't use the native glob). Partly
26 from and tested by Corinna Vinschen.
22 27
2320060831 2820060831
24 - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ] 29 - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ]
@@ -5370,4 +5375,4 @@
5370 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5375 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5371 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5376 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5372 5377
5373$Id: ChangeLog,v 1.4523 2006/09/01 09:29:01 dtucker Exp $ 5378$Id: ChangeLog,v 1.4524 2006/09/01 10:29:10 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 3aba414a2..c37d7f499 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.356 2006/08/30 17:24:41 djm Exp $ 1# $Id: configure.ac,v 1.357 2006/09/01 10:29:11 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.356 $) 18AC_REVISION($Revision: 1.357 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -982,6 +982,8 @@ AC_TRY_COMPILE(
982 ] 982 ]
983) 983)
984 984
985AC_CHECK_DECLS(GLOB_NOMATCH, , , [#include <glob.h>])
986
985AC_MSG_CHECKING([whether struct dirent allocates space for d_name]) 987AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
986AC_RUN_IFELSE( 988AC_RUN_IFELSE(
987 [AC_LANG_SOURCE([[ 989 [AC_LANG_SOURCE([[
diff --git a/includes.h b/includes.h
index 2101f13c9..967fcc26c 100644
--- a/includes.h
+++ b/includes.h
@@ -30,7 +30,8 @@
30# include <bstring.h> 30# include <bstring.h>
31#endif 31#endif
32#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \ 32#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \
33 defined(GLOB_HAS_GL_MATCHC) 33 defined(GLOB_HAS_GL_MATCHC) && \
34 defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0
34# include <glob.h> 35# include <glob.h>
35#endif 36#endif
36#ifdef HAVE_ENDIAN_H 37#ifdef HAVE_ENDIAN_H
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index ec16b1108..b3dd2b171 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -47,7 +47,8 @@
47#include <unistd.h> 47#include <unistd.h>
48 48
49#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \ 49#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \
50 !defined(GLOB_HAS_GL_MATCHC) 50 !defined(GLOB_HAS_GL_MATCHC) || \
51 !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0
51 52
52static long 53static long
53get_arg_max(void) 54get_arg_max(void)
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index 4fdbfc1ea..9ba07f76e 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -38,7 +38,8 @@
38/* OPENBSD ORIGINAL: include/glob.h */ 38/* OPENBSD ORIGINAL: include/glob.h */
39 39
40#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \ 40#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \
41 !defined(GLOB_HAS_GL_MATCHC) 41 !defined(GLOB_HAS_GL_MATCHC) || \
42 !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0
42 43
43#ifndef _GLOB_H_ 44#ifndef _GLOB_H_
44#define _GLOB_H_ 45#define _GLOB_H_