diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2006-09-01 20:29:10 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2006-09-01 20:29:10 +1000 |
| commit | 096faecdea1e39ecace0b20f4e208bd7ec33f6d2 (patch) | |
| tree | 7756d6d5fefe40aab00431d47075175a5641b9a1 /includes.h | |
| parent | 0646ca6be81c4f0f619d92a4e5a041b58c79a221 (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.
Diffstat (limited to 'includes.h')
| -rw-r--r-- | includes.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 |