- Some older systems don't have poll.h, they use sys/poll.h instead

 - Doc updates

diff --git a/ChangeLog b/ChangeLog
index e22c22b1d5a880e0893212d4d057106d250bacef..0bd6c4e7b15d37eb399555f9a58454fd05c505e9 100644 (file)
--- 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 d3e37ca4ddf6b1a85bddeb0ea5bd153c1b0d1739..de92edc42801f354a993df27e4b37e84fbdc7c58 100644 (file)
--- 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 1f96da22cc4fedfc752a4d3411f2508d2277ecf3..514aeaa783a6d114c1a3966efe22c8340f0004d8 100644 (file)
--- 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 c4894c071cdbce7364b37bc08b69f0bfac7ebf64..aa23baece1931e8f5dee5a29a0bc5f410481743f 100644 (file)
--- 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 3fdc1e0de8c79ca656d95c063662d30ec28f75de..c9e7e0bb664f32421f73e6ca467105a4dd40d89d 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -13,7 +13,13 @@
 #include "includes.h"
 RCSID("$Id$");
 
-#include <poll.h>
+#ifdef HAVE_POLL_H
+# include <poll.h>
+#else /* HAVE_POLL_H */
+# ifdef HAVE_SYS_POLL_H
+#  include <sys/poll.h>
+# endif /* HAVE_SYS_POLL_H */
+#endif /* HAVE_POLL_H */
 
 #include "xmalloc.h"
 #include "rsa.h"