diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | includes.h | 3 |
3 files changed, 8 insertions, 3 deletions
@@ -12,6 +12,8 @@ | |||
12 | - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Bug #796: | 12 | - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Bug #796: |
13 | Restore previous authdb setting after auth calls. Fixes problems with | 13 | Restore previous authdb setting after auth calls. Fixes problems with |
14 | setpcred failing on accounts that use AFS or NIS password registries. | 14 | setpcred failing on accounts that use AFS or NIS password registries. |
15 | - (dtucker) [configure.ac includes.h] Include <sys/stream.h> if present, | ||
16 | required on Solaris 2.5.1 for queue_t, which is used by <sys/ptms.h>. | ||
15 | - (dtucker) OpenBSD CVS Sync | 17 | - (dtucker) OpenBSD CVS Sync |
16 | - markus@cvs.openbsd.org 2004/01/30 09:48:57 | 18 | - markus@cvs.openbsd.org 2004/01/30 09:48:57 |
17 | [auth-passwd.c auth.h pathnames.h session.c] | 19 | [auth-passwd.c auth.h pathnames.h session.c] |
@@ -1809,4 +1811,4 @@ | |||
1809 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1811 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1810 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1812 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1811 | 1813 | ||
1812 | $Id: ChangeLog,v 1.3214 2004/02/06 05:41:37 dtucker Exp $ | 1814 | $Id: ChangeLog,v 1.3215 2004/02/06 10:29:41 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index 64645217d..bdff63db3 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.193 2004/02/06 05:24:31 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.194 2004/02/06 10:29:42 dtucker Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -494,7 +494,7 @@ AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \ | |||
494 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ | 494 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ |
495 | strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \ | 495 | strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \ |
496 | sys/cdefs.h sys/mman.h sys/pstat.h sys/ptms.h sys/select.h sys/stat.h \ | 496 | sys/cdefs.h sys/mman.h sys/pstat.h sys/ptms.h sys/select.h sys/stat.h \ |
497 | sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \ | 497 | sys/stream.h sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \ |
498 | sys/un.h time.h tmpdir.h ttyent.h usersec.h \ | 498 | sys/un.h time.h tmpdir.h ttyent.h usersec.h \ |
499 | util.h utime.h utmp.h utmpx.h vis.h) | 499 | util.h utime.h utmp.h utmpx.h vis.h) |
500 | 500 | ||
diff --git a/includes.h b/includes.h index d2cc88213..ca943c7e6 100644 --- a/includes.h +++ b/includes.h | |||
@@ -135,6 +135,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
135 | #include <sys/strtio.h> /* for TIOCCBRK on HP-UX */ | 135 | #include <sys/strtio.h> /* for TIOCCBRK on HP-UX */ |
136 | #endif | 136 | #endif |
137 | #if defined(HAVE_SYS_PTMS_H) && defined(HAVE_DEV_PTMX) | 137 | #if defined(HAVE_SYS_PTMS_H) && defined(HAVE_DEV_PTMX) |
138 | # if defined(HAVE_SYS_STREAM_H) | ||
139 | # include <sys/stream.h> /* reqd for queue_t on Solaris 2.5.1 */ | ||
140 | # endif | ||
138 | #include <sys/ptms.h> /* for grantpt() and friends */ | 141 | #include <sys/ptms.h> /* for grantpt() and friends */ |
139 | #endif | 142 | #endif |
140 | 143 | ||