diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.in | 20 | ||||
-rw-r--r-- | includes.h | 3 | ||||
-rw-r--r-- | openbsd-compat/glob.c | 6 | ||||
-rw-r--r-- | openbsd-compat/glob.h | 6 |
6 files changed, 36 insertions, 8 deletions
@@ -22,6 +22,8 @@ | |||
22 | [auth-options.c channels.c channels.h serverloop.c session.c] | 22 | [auth-options.c channels.c channels.h serverloop.c session.c] |
23 | implement "permitopen" key option, restricts -L style forwarding to | 23 | implement "permitopen" key option, restricts -L style forwarding to |
24 | to specified host:port pairs. based on work by harlan@genua.de | 24 | to specified host:port pairs. based on work by harlan@genua.de |
25 | - Check for gl_matchc support in glob_t and fall back to the | ||
26 | openbsd-compat/glob.[ch] support if it does not exist. | ||
25 | 27 | ||
26 | 20010315 | 28 | 20010315 |
27 | - OpenBSD CVS Sync | 29 | - OpenBSD CVS Sync |
@@ -4584,4 +4586,4 @@ | |||
4584 | - Wrote replacements for strlcpy and mkdtemp | 4586 | - Wrote replacements for strlcpy and mkdtemp |
4585 | - Released 1.0pre1 | 4587 | - Released 1.0pre1 |
4586 | 4588 | ||
4587 | $Id: ChangeLog,v 1.967 2001/03/17 00:47:54 mouring Exp $ | 4589 | $Id: ChangeLog,v 1.968 2001/03/17 01:15:38 mouring Exp $ |
diff --git a/acconfig.h b/acconfig.h index 65584fc3f..57b5e6076 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.107 2001/03/14 00:39:46 djm Exp $ */ | 1 | /* $Id: acconfig.h,v 1.108 2001/03/17 01:15:38 mouring Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -305,6 +305,9 @@ | |||
305 | /* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */ | 305 | /* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */ |
306 | #undef GLOB_HAS_ALTDIRFUNC | 306 | #undef GLOB_HAS_ALTDIRFUNC |
307 | 307 | ||
308 | /* Define if your system glob() function has gl_matchc options in glob_t */ | ||
309 | #undef GLOB_HAS_GL_MATCHC | ||
310 | |||
308 | @BOTTOM@ | 311 | @BOTTOM@ |
309 | 312 | ||
310 | /* ******************* Shouldn't need to edit below this line ************** */ | 313 | /* ******************* Shouldn't need to edit below this line ************** */ |
diff --git a/configure.in b/configure.in index d3a902a86..a6ad607c1 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.265 2001/03/14 00:39:46 djm Exp $ | 1 | # $Id: configure.in,v 1.266 2001/03/17 01:15:38 mouring Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -388,6 +388,24 @@ AC_EGREP_CPP(FOUNDIT, | |||
388 | ] | 388 | ] |
389 | ) | 389 | ) |
390 | 390 | ||
391 | # Check for g.gl_matchc glob() extension | ||
392 | AC_MSG_CHECKING(for gl_matchc field in glob_t) | ||
393 | AC_EGREP_CPP(FOUNDIT, | ||
394 | [ | ||
395 | #include <glob.h> | ||
396 | int main(void){glob_t g; g.gl_matchc = 1;} | ||
397 | ], | ||
398 | [ | ||
399 | AC_DEFINE(GLOB_HAS_GL_MATCHC) | ||
400 | AC_MSG_RESULT(yes) | ||
401 | ], | ||
402 | [ | ||
403 | AC_MSG_RESULT(no) | ||
404 | ] | ||
405 | ) | ||
406 | |||
407 | |||
408 | |||
391 | # Check whether user wants Kerberos support | 409 | # Check whether user wants Kerberos support |
392 | KRB4_MSG="no" | 410 | KRB4_MSG="no" |
393 | AC_ARG_WITH(kerberos4, | 411 | AC_ARG_WITH(kerberos4, |
diff --git a/includes.h b/includes.h index 3f834ba86..8b7bb0ed8 100644 --- a/includes.h +++ b/includes.h | |||
@@ -54,7 +54,8 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
54 | #ifdef HAVE_BSTRING_H | 54 | #ifdef HAVE_BSTRING_H |
55 | # include <bstring.h> | 55 | # include <bstring.h> |
56 | #endif | 56 | #endif |
57 | #if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) | 57 | #if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \ |
58 | defined(GLOB_HAS_GL_MATCHC) | ||
58 | # include <glob.h> | 59 | # include <glob.h> |
59 | #endif | 60 | #endif |
60 | #ifdef HAVE_NETGROUP_H | 61 | #ifdef HAVE_NETGROUP_H |
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 2e2551866..e2fd7c27f 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c | |||
@@ -37,7 +37,8 @@ | |||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | #include <ctype.h> | 38 | #include <ctype.h> |
39 | 39 | ||
40 | #if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) | 40 | #if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \ |
41 | !defined(GLOB_HAS_GL_MATCHC) | ||
41 | 42 | ||
42 | #if defined(LIBC_SCCS) && !defined(lint) | 43 | #if defined(LIBC_SCCS) && !defined(lint) |
43 | #if 0 | 44 | #if 0 |
@@ -855,5 +856,6 @@ qprintf(str, s) | |||
855 | } | 856 | } |
856 | #endif | 857 | #endif |
857 | 858 | ||
858 | #endif /* !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) */ | 859 | #endif /* !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || |
860 | !defined(GLOB_HAS_GL_MATCHC) */ | ||
859 | 861 | ||
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h index 392c63b67..a08cee572 100644 --- a/openbsd-compat/glob.h +++ b/openbsd-compat/glob.h | |||
@@ -39,7 +39,8 @@ | |||
39 | * @(#)glob.h 8.1 (Berkeley) 6/2/93 | 39 | * @(#)glob.h 8.1 (Berkeley) 6/2/93 |
40 | */ | 40 | */ |
41 | 41 | ||
42 | #if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) | 42 | #if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \ |
43 | !defined(GLOB_HAS_GL_MATCHC) | ||
43 | 44 | ||
44 | #ifndef _GLOB_H_ | 45 | #ifndef _GLOB_H_ |
45 | #define _GLOB_H_ | 46 | #define _GLOB_H_ |
@@ -94,5 +95,6 @@ void globfree __P((glob_t *)); | |||
94 | 95 | ||
95 | #endif /* !_GLOB_H_ */ | 96 | #endif /* !_GLOB_H_ */ |
96 | 97 | ||
97 | #endif /* !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) */ | 98 | #endif /* !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || |
99 | !defined(GLOB_HAS_GL_MATCHC */ | ||
98 | 100 | ||