diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | acconfig.h | 3 | ||||
-rw-r--r-- | compat.c | 10 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | fake-regex.h | 110 |
5 files changed, 127 insertions, 3 deletions
@@ -3,6 +3,9 @@ | |||
3 | - markus@cvs.openbsd.org 2001/01/19 12:45:26 | 3 | - markus@cvs.openbsd.org 2001/01/19 12:45:26 |
4 | [ssh-chall.c servconf.c servconf.h ssh.h sshd.c] | 4 | [ssh-chall.c servconf.c servconf.h ssh.h sshd.c] |
5 | only auth-chall.c needs #ifdef SKEY | 5 | only auth-chall.c needs #ifdef SKEY |
6 | - (bal) Slight auth2-pam.c clean up. | ||
7 | - (bal) Includes a fake-regexp.h to be only used if regcomp() is found, | ||
8 | but no 'regexp.h' found (SCO OpenServer 3 lacks the header). | ||
6 | 9 | ||
7 | 20010119 | 10 | 20010119 |
8 | - (djm) Update versions in RPM specfiles | 11 | - (djm) Update versions in RPM specfiles |
diff --git a/acconfig.h b/acconfig.h index 439a7ba1c..936a7ca5e 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -252,6 +252,9 @@ | |||
252 | #undef HAVE_SS_FAMILY_IN_SS | 252 | #undef HAVE_SS_FAMILY_IN_SS |
253 | #undef HAVE___SS_FAMILY_IN_SS | 253 | #undef HAVE___SS_FAMILY_IN_SS |
254 | 254 | ||
255 | /* Define if you have a regcomp() function */ | ||
256 | #undef HAVE_REGCOMP | ||
257 | |||
255 | /* Define if you have /dev/ptmx */ | 258 | /* Define if you have /dev/ptmx */ |
256 | #undef HAVE_DEV_PTMX | 259 | #undef HAVE_DEV_PTMX |
257 | 260 | ||
@@ -32,7 +32,15 @@ RCSID("$OpenBSD: compat.c,v 1.33 2001/01/08 22:29:05 markus Exp $"); | |||
32 | #ifdef HAVE_LIBPCRE | 32 | #ifdef HAVE_LIBPCRE |
33 | # include <pcreposix.h> | 33 | # include <pcreposix.h> |
34 | #else /* Use native regex libraries */ | 34 | #else /* Use native regex libraries */ |
35 | # include <regex.h> | 35 | # ifdef HAVE_REGEX_H |
36 | # include <regex.h> | ||
37 | # else | ||
38 | # ifdef HAVE_REGCOMP | ||
39 | # include "fake-regex.h" | ||
40 | # else | ||
41 | # error "No regular libraries detected. See INSTALL file." | ||
42 | # endif | ||
43 | # endif | ||
36 | #endif /* HAVE_LIBPCRE */ | 44 | #endif /* HAVE_LIBPCRE */ |
37 | 45 | ||
38 | int compat13 = 0; | 46 | int compat13 = 0; |
diff --git a/configure.in b/configure.in index ad05a6e7c..23d5a0944 100644 --- a/configure.in +++ b/configure.in | |||
@@ -296,7 +296,7 @@ AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first | |||
296 | AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil") | 296 | AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil") |
297 | 297 | ||
298 | AC_CHECK_FUNC(regcomp, | 298 | AC_CHECK_FUNC(regcomp, |
299 | [], | 299 | [ AC_DEFINE(HAVE_REGCOMP)], |
300 | [ | 300 | [ |
301 | AC_CHECK_LIB(pcre, pcre_info, | 301 | AC_CHECK_LIB(pcre, pcre_info, |
302 | AC_DEFINE(HAVE_LIBPCRE) LIBS="$LIBS -lpcreposix -lpcre") | 302 | AC_DEFINE(HAVE_LIBPCRE) LIBS="$LIBS -lpcreposix -lpcre") |
@@ -312,7 +312,7 @@ AC_CHECK_FUNC(utimes, | |||
312 | ) | 312 | ) |
313 | 313 | ||
314 | # Checks for header files. | 314 | # Checks for header files. |
315 | AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) | 315 | AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regexp.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) |
316 | 316 | ||
317 | dnl Checks for library functions. | 317 | dnl Checks for library functions. |
318 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) | 318 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) |
diff --git a/fake-regex.h b/fake-regex.h new file mode 100644 index 000000000..8c4a8f1ca --- /dev/null +++ b/fake-regex.h | |||
@@ -0,0 +1,110 @@ | |||
1 | /* $OpenBSD: regex.h,v 1.3 1997/09/21 10:45:48 niklas Exp $ */ | ||
2 | /* $NetBSD: regex.h,v 1.4.6.1 1996/06/10 18:57:07 explorer Exp $ */ | ||
3 | |||
4 | /*- | ||
5 | * Copyright (c) 1992 Henry Spencer. | ||
6 | * Copyright (c) 1992, 1993 | ||
7 | * The Regents of the University of California. All rights reserved. | ||
8 | * | ||
9 | * This code is derived from software contributed to Berkeley by | ||
10 | * Henry Spencer of the University of Toronto. | ||
11 | * | ||
12 | * Redistribution and use in source and binary forms, with or without | ||
13 | * modification, are permitted provided that the following conditions | ||
14 | * are met: | ||
15 | * 1. Redistributions of source code must retain the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer. | ||
17 | * 2. Redistributions in binary form must reproduce the above copyright | ||
18 | * notice, this list of conditions and the following disclaimer in the | ||
19 | * documentation and/or other materials provided with the distribution. | ||
20 | * 3. All advertising materials mentioning features or use of this software | ||
21 | * must display the following acknowledgement: | ||
22 | * This product includes software developed by the University of | ||
23 | * California, Berkeley and its contributors. | ||
24 | * 4. Neither the name of the University nor the names of its contributors | ||
25 | * may be used to endorse or promote products derived from this software | ||
26 | * without specific prior written permission. | ||
27 | * | ||
28 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
29 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
30 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
31 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
32 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
33 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
34 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
35 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
36 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
37 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
38 | * SUCH DAMAGE. | ||
39 | * | ||
40 | * @(#)regex.h 8.1 (Berkeley) 6/2/93 | ||
41 | */ | ||
42 | |||
43 | #ifndef _REGEX_H_ | ||
44 | #define _REGEX_H_ | ||
45 | |||
46 | #include <sys/cdefs.h> | ||
47 | #include <sys/types.h> | ||
48 | |||
49 | /* types */ | ||
50 | typedef off_t regoff_t; | ||
51 | |||
52 | typedef struct { | ||
53 | int re_magic; | ||
54 | size_t re_nsub; /* number of parenthesized subexpressions */ | ||
55 | const char *re_endp; /* end pointer for REG_PEND */ | ||
56 | struct re_guts *re_g; /* none of your business :-) */ | ||
57 | } regex_t; | ||
58 | |||
59 | typedef struct { | ||
60 | regoff_t rm_so; /* start of match */ | ||
61 | regoff_t rm_eo; /* end of match */ | ||
62 | } regmatch_t; | ||
63 | |||
64 | /* regcomp() flags */ | ||
65 | #define REG_BASIC 0000 | ||
66 | #define REG_EXTENDED 0001 | ||
67 | #define REG_ICASE 0002 | ||
68 | #define REG_NOSUB 0004 | ||
69 | #define REG_NEWLINE 0010 | ||
70 | #define REG_NOSPEC 0020 | ||
71 | #define REG_PEND 0040 | ||
72 | #define REG_DUMP 0200 | ||
73 | |||
74 | /* regerror() flags */ | ||
75 | #define REG_NOMATCH 1 | ||
76 | #define REG_BADPAT 2 | ||
77 | #define REG_ECOLLATE 3 | ||
78 | #define REG_ECTYPE 4 | ||
79 | #define REG_EESCAPE 5 | ||
80 | #define REG_ESUBREG 6 | ||
81 | #define REG_EBRACK 7 | ||
82 | #define REG_EPAREN 8 | ||
83 | #define REG_EBRACE 9 | ||
84 | #define REG_BADBR 10 | ||
85 | #define REG_ERANGE 11 | ||
86 | #define REG_ESPACE 12 | ||
87 | #define REG_BADRPT 13 | ||
88 | #define REG_EMPTY 14 | ||
89 | #define REG_ASSERT 15 | ||
90 | #define REG_INVARG 16 | ||
91 | #define REG_ATOI 255 /* convert name to number (!) */ | ||
92 | #define REG_ITOA 0400 /* convert number to name (!) */ | ||
93 | |||
94 | /* regexec() flags */ | ||
95 | #define REG_NOTBOL 00001 | ||
96 | #define REG_NOTEOL 00002 | ||
97 | #define REG_STARTEND 00004 | ||
98 | #define REG_TRACE 00400 /* tracing of execution */ | ||
99 | #define REG_LARGE 01000 /* force large representation */ | ||
100 | #define REG_BACKR 02000 /* force use of backref code */ | ||
101 | |||
102 | __BEGIN_DECLS | ||
103 | int regcomp __P((regex_t *, const char *, int)); | ||
104 | size_t regerror __P((int, const regex_t *, char *, size_t)); | ||
105 | int regexec __P((const regex_t *, | ||
106 | const char *, size_t, regmatch_t [], int)); | ||
107 | void regfree __P((regex_t *)); | ||
108 | __END_DECLS | ||
109 | |||
110 | #endif /* !_REGEX_H_ */ | ||