From 6ae00d6c965e61fc394b8adb698e9d8c603bbe75 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 14 Dec 1999 15:43:03 +1100 Subject: [PATCH] - Some older systems don't have poll.h, they use sys/poll.h instead - Doc updates --- ChangeLog | 2 ++ INSTALL | 11 +++++++++++ README | 3 +++ configure.in | 2 +- sshd.c | 10 ++++++++-- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e22c22b1d..0bd6c4e7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ - [version.h] OpenSSH-1.2.1 - Clean up broken includes in pty.c + - Some older systems don't have poll.h, they use sys/poll.h instead + - Doc updates 19991211 - Fix compilation on systems with AFS. Reported by diff --git a/INSTALL b/INSTALL index d3e37ca4d..de92edc42 100644 --- a/INSTALL +++ b/INSTALL @@ -113,6 +113,17 @@ To generate a host key, issue the following command: (replacing /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' +Replacing /etc/ssh with the correct path to the configuration directory. +(${prefix}/etc or whatever you specified with --sysconfdir during +configuration) + For more information on configuration, please refer to the manual pages for sshd, ssh and ssh-agent. +4. Problems? +------------ + +If you experience problems compiling, installing or running OpenSSH. +Please refer to the "reporting bugs" section of the webpage at +http://violet.ibs.com.au/openssh/ + diff --git a/README b/README index 1f96da22c..514aeaa78 100644 --- a/README +++ b/README @@ -37,6 +37,9 @@ openssh-unix-dev-request@mindrot.org. This mailing list is intended for developers who wish to improve on this port or extend it to other Unices. +Please send bug reports to the mailing list, or to myself +(djm@ibs.com.au). + Please refer to the INSTALL document for information on how to install OpenSSH on your system. diff --git a/configure.in b/configure.in index c4894c071..aa23baece 100644 --- a/configure.in +++ b/configure.in @@ -56,7 +56,7 @@ AC_CHECK_LIB(dl, dlopen, , ) AC_CHECK_LIB(pam, pam_authenticate, , ) dnl Checks for header files. -AC_CHECK_HEADERS(endian.h lastlog.h login.h maillock.h netgroup.h paths.h pty.h shadow.h util.h utmp.h utmpx.h sys/select.h sys/stropts.h sys/time.h) +AC_CHECK_HEADERS(endian.h lastlog.h login.h maillock.h netgroup.h paths.h poll.h pty.h shadow.h util.h utmp.h utmpx.h sys/poll.h sys/select.h sys/stropts.h sys/time.h) dnl Checks for library functions. AC_CHECK_FUNCS(arc4random mkdtemp openpty _getpty setenv setlogin setproctitle snprintf strlcat strlcpy vsnprintf) diff --git a/sshd.c b/sshd.c index 3e9ff907b..448ca5968 100644 --- a/sshd.c +++ b/sshd.c @@ -11,9 +11,15 @@ */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.38 1999/12/13 23:47:16 damien Exp $"); +RCSID("$Id: sshd.c,v 1.39 1999/12/14 04:43:03 damien Exp $"); -#include +#ifdef HAVE_POLL_H +# include +#else /* HAVE_POLL_H */ +# ifdef HAVE_SYS_POLL_H +# include +# endif /* HAVE_SYS_POLL_H */ +#endif /* HAVE_POLL_H */ #include "xmalloc.h" #include "rsa.h"