diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | INSTALL | 7 | ||||
-rw-r--r-- | TODO | 2 | ||||
-rw-r--r-- | acconfig.h | 3 | ||||
-rw-r--r-- | compat.c | 6 | ||||
-rw-r--r-- | configure.in | 1 |
6 files changed, 17 insertions, 3 deletions
@@ -1,4 +1,5 @@ | |||
1 | 20001014 | 1 | 20001014 |
2 | - (bal) Add support for GNU rx library for those lacking regexp support | ||
2 | - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth | 3 | - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth |
3 | - (djm) Revert SSH2 serverloop hack, will find a better way. | 4 | - (djm) Revert SSH2 serverloop hack, will find a better way. |
4 | - (djm) Add workaround for Linux 2.4's gratuitious errno change. Patch | 5 | - (djm) Add workaround for Linux 2.4's gratuitious errno change. Patch |
@@ -40,6 +40,13 @@ ftp://ftp.gnu.org/gnu/make/ | |||
40 | OpenSSH has only been tested with GNU make. It may work with other | 40 | OpenSSH has only been tested with GNU make. It may work with other |
41 | 'make' programs, but you are on your own. | 41 | 'make' programs, but you are on your own. |
42 | 42 | ||
43 | GNU rx: | ||
44 | ftp:://ftp.gnu.org/gnu/rx/ | ||
45 | |||
46 | Most platforms do not required this. However older 4.3 BSD do not | ||
47 | have a posix regex library. | ||
48 | |||
49 | |||
43 | 2. Building / Installation | 50 | 2. Building / Installation |
44 | -------------------------- | 51 | -------------------------- |
45 | 52 | ||
@@ -9,6 +9,4 @@ | |||
9 | 9 | ||
10 | - Cleanup configure.in | 10 | - Cleanup configure.in |
11 | 11 | ||
12 | - utmp/wtmp logging does not work on NeXT | ||
13 | |||
14 | - Complete Tru64 SIA support | 12 | - Complete Tru64 SIA support |
diff --git a/acconfig.h b/acconfig.h index a17cba825..3bf61ec92 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -52,6 +52,9 @@ | |||
52 | /* Define if you are on Cygwin */ | 52 | /* Define if you are on Cygwin */ |
53 | #undef HAVE_CYGWIN | 53 | #undef HAVE_CYGWIN |
54 | 54 | ||
55 | /* Define if you lack native POSIX regex and you are using GNU rx library */ | ||
56 | #undef HAVE_LIBRX | ||
57 | |||
55 | /* Define if you are on NeXT */ | 58 | /* Define if you are on NeXT */ |
56 | #undef HAVE_NEXT | 59 | #undef HAVE_NEXT |
57 | 60 | ||
@@ -29,7 +29,11 @@ RCSID("$OpenBSD: compat.c,v 1.24 2000/10/10 20:20:45 markus Exp $"); | |||
29 | #include "packet.h" | 29 | #include "packet.h" |
30 | #include "xmalloc.h" | 30 | #include "xmalloc.h" |
31 | #include "compat.h" | 31 | #include "compat.h" |
32 | #include <regex.h> | 32 | #ifdef HAVE_LIBRX |
33 | # include <rxposix.h> | ||
34 | #else /* Use native regex libraries */ | ||
35 | # include <regex.h> | ||
36 | #endif /* HAVE_LIBRX */ | ||
33 | 37 | ||
34 | int compat13 = 0; | 38 | int compat13 = 0; |
35 | int compat20 = 0; | 39 | int compat20 = 0; |
diff --git a/configure.in b/configure.in index 7ff324bb0..a6bed7508 100644 --- a/configure.in +++ b/configure.in | |||
@@ -256,6 +256,7 @@ AC_ARG_WITH(libs, | |||
256 | # Checks for libraries. | 256 | # Checks for libraries. |
257 | AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***])) | 257 | AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***])) |
258 | AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil") | 258 | AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil") |
259 | AC_CHECK_LIB(rx, regcomp, AC_DEFINE(HAVE_LIBRX) LIBS="$LIBS -lrx") | ||
259 | 260 | ||
260 | if test -z "$no_libsocket" ; then | 261 | if test -z "$no_libsocket" ; then |
261 | AC_CHECK_LIB(nsl, yp_match, , ) | 262 | AC_CHECK_LIB(nsl, yp_match, , ) |