diff options
-rw-r--r-- | CREDITS | 3 | ||||
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 10 | ||||
-rw-r--r-- | defines.h | 22 | ||||
-rw-r--r-- | includes.h | 4 |
5 files changed, 29 insertions, 15 deletions
@@ -4,7 +4,8 @@ Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, | |||
4 | Theo de Raadt, and Dug Song - Creators of OpenSSH | 4 | Theo de Raadt, and Dug Song - Creators of OpenSSH |
5 | 5 | ||
6 | Andrew Stribblehill <a.d.stribblehill@durham.ac.uk> - Bugfixes | 6 | Andrew Stribblehill <a.d.stribblehill@durham.ac.uk> - Bugfixes |
7 | Andre Lucas <andre.lucas@dial.pipex.com> - build, login and many other fixes | 7 | Andre Lucas <andre.lucas@dial.pipex.com> - new login code, many fixes |
8 | Andrew McGill <andrewm@datrix.co.za> - SCO fixes | ||
8 | Andy Sloane <andy@guildsoftware.com> - bugfixes | 9 | Andy Sloane <andy@guildsoftware.com> - bugfixes |
9 | Arkadiusz Miskiewicz <misiek@pld.org.pl> - IPv6 compat fixes | 10 | Arkadiusz Miskiewicz <misiek@pld.org.pl> - IPv6 compat fixes |
10 | Ben Taylor <bent@clark.net> - Solaris debugging and fixes | 11 | Ben Taylor <bent@clark.net> - Solaris debugging and fixes |
@@ -1,3 +1,8 @@ | |||
1 | 20000613 | ||
2 | - (djm) Fixes from Andrew McGill <andrewm@datrix.co.za>: | ||
3 | - Platform define for SCO 3.x which breaks on /dev/ptmx | ||
4 | - Detect and try to fix missing MAXPATHLEN | ||
5 | |||
1 | 20000612 | 6 | 20000612 |
2 | - (djm) Glob manpages in RPM spec files to catch compressed files | 7 | - (djm) Glob manpages in RPM spec files to catch compressed files |
3 | - (djm) Full license in auth-pam.c | 8 | - (djm) Full license in auth-pam.c |
diff --git a/configure.in b/configure.in index 77ece4418..3bdf41133 100644 --- a/configure.in +++ b/configure.in | |||
@@ -129,6 +129,14 @@ case "$host" in | |||
129 | mansubdir=cat | 129 | mansubdir=cat |
130 | LIBS="$LIBS -lgen -lsocket" | 130 | LIBS="$LIBS -lgen -lsocket" |
131 | ;; | 131 | ;; |
132 | *-*-sco3*) | ||
133 | CFLAGS="$CFLAGS -I/usr/local/include" | ||
134 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
135 | MANTYPE='$(CATMAN)' | ||
136 | mansubdir=cat | ||
137 | LIBS="$LIBS -lgen -lsocket" | ||
138 | no_dev_ptmx=1 | ||
139 | ;; | ||
132 | esac | 140 | esac |
133 | 141 | ||
134 | # Allow user to specify flags | 142 | # Allow user to specify flags |
@@ -170,7 +178,7 @@ if test -z "$no_libnsl" ; then | |||
170 | fi | 178 | fi |
171 | 179 | ||
172 | # Checks for header files. | 180 | # Checks for header files. |
173 | AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.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/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h util.h utmp.h utmpx.h) | 181 | AC_CHECK_HEADERS(bstring.h endian.h lastlog.h limits.h login.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/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h util.h utmp.h utmpx.h) |
174 | 182 | ||
175 | # Checks for library functions. | 183 | # Checks for library functions. |
176 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy vsnprintf vhangup _getpty __b64_ntop) | 184 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy vsnprintf vhangup _getpty __b64_ntop) |
@@ -4,33 +4,29 @@ | |||
4 | /* Necessary headers */ | 4 | /* Necessary headers */ |
5 | 5 | ||
6 | #include <sys/types.h> /* For [u]intxx_t */ | 6 | #include <sys/types.h> /* For [u]intxx_t */ |
7 | |||
8 | #include <sys/socket.h> /* For SHUT_XXXX */ | 7 | #include <sys/socket.h> /* For SHUT_XXXX */ |
9 | 8 | #include <sys/param.h> /* For MAXPATHLEN */ | |
10 | # include <netinet/in_systm.h> /* For typedefs */ | 9 | #include <netinet/in_systm.h> /* For typedefs */ |
11 | #include <netinet/in.h> /* For IPv6 macros */ | 10 | #include <netinet/in.h> /* For IPv6 macros */ |
12 | #include <netinet/ip.h> /* For IPTOS macros */ | 11 | #include <netinet/ip.h> /* For IPTOS macros */ |
13 | |||
14 | #ifdef HAVE_SYS_BITYPES_H | 12 | #ifdef HAVE_SYS_BITYPES_H |
15 | # include <sys/bitypes.h> /* For u_intXX_t */ | 13 | # include <sys/bitypes.h> /* For u_intXX_t */ |
16 | #endif | 14 | #endif |
17 | |||
18 | #ifdef HAVE_PATHS_H | 15 | #ifdef HAVE_PATHS_H |
19 | # include <paths.h> /* For _PATH_XXX */ | 16 | # include <paths.h> /* For _PATH_XXX */ |
20 | #endif | 17 | #endif |
21 | 18 | #ifdef HAVE_LIMITS_H | |
19 | # include <limits.h> /* For PATH_MAX */ | ||
20 | #endif | ||
22 | #ifdef HAVE_SYS_TIME_H | 21 | #ifdef HAVE_SYS_TIME_H |
23 | # include <sys/time.h> /* For timersub */ | 22 | # include <sys/time.h> /* For timersub */ |
24 | #endif | 23 | #endif |
25 | |||
26 | #ifdef HAVE_MAILLOCK_H | 24 | #ifdef HAVE_MAILLOCK_H |
27 | # include <maillock.h> /* For _PATH_MAILDIR */ | 25 | # include <maillock.h> /* For _PATH_MAILDIR */ |
28 | #endif | 26 | #endif |
29 | |||
30 | #ifdef HAVE_SYS_CDEFS_H | 27 | #ifdef HAVE_SYS_CDEFS_H |
31 | # include <sys/cdefs.h> /* For __P() */ | 28 | # include <sys/cdefs.h> /* For __P() */ |
32 | #endif | 29 | #endif |
33 | |||
34 | #ifdef HAVE_SYS_SYSMACROS_H | 30 | #ifdef HAVE_SYS_SYSMACROS_H |
35 | # include <sys/sysmacros.h> /* For MIN, MAX, etc */ | 31 | # include <sys/sysmacros.h> /* For MIN, MAX, etc */ |
36 | #endif | 32 | #endif |
@@ -57,6 +53,14 @@ enum | |||
57 | # define IPTOS_MINCOST IPTOS_LOWCOST | 53 | # define IPTOS_MINCOST IPTOS_LOWCOST |
58 | #endif /* IPTOS_LOWDELAY */ | 54 | #endif /* IPTOS_LOWDELAY */ |
59 | 55 | ||
56 | #ifndef MAXPATHLEN | ||
57 | # ifdef PATH_MAX | ||
58 | # define MAXPATHLEN PATH_MAX | ||
59 | # else /* PATH_MAX */ | ||
60 | # define MAXPATHLEN 64 /* Should be safe */ | ||
61 | # endif /* PATH_MAX */ | ||
62 | #endif /* MAXPATHLEN */ | ||
63 | |||
60 | /* Types */ | 64 | /* Types */ |
61 | 65 | ||
62 | /* If sys/types.h does not supply intXX_t, supply them ourselves */ | 66 | /* If sys/types.h does not supply intXX_t, supply them ourselves */ |
diff --git a/includes.h b/includes.h index da1ee9ced..31b7f349f 100644 --- a/includes.h +++ b/includes.h | |||
@@ -23,7 +23,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
23 | 23 | ||
24 | #include <sys/types.h> | 24 | #include <sys/types.h> |
25 | #include <sys/socket.h> | 25 | #include <sys/socket.h> |
26 | #include <sys/param.h> | ||
27 | #include <sys/ioctl.h> | 26 | #include <sys/ioctl.h> |
28 | #include <sys/stat.h> | 27 | #include <sys/stat.h> |
29 | #include <sys/wait.h> | 28 | #include <sys/wait.h> |
@@ -58,9 +57,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
58 | #ifdef HAVE_NETDB_H | 57 | #ifdef HAVE_NETDB_H |
59 | # include <netdb.h> | 58 | # include <netdb.h> |
60 | #endif | 59 | #endif |
61 | #ifdef HAVE_PATHS_H | ||
62 | # include <paths.h> | ||
63 | #endif | ||
64 | #ifdef HAVE_ENDIAN_H | 60 | #ifdef HAVE_ENDIAN_H |
65 | # include <endian.h> | 61 | # include <endian.h> |
66 | #endif | 62 | #endif |