OpenSSH 2.4?

[mouring at etoh.eviladmin.org]

On Fri, 2 Feb 2001, Corinna Vinschen wrote:

> On Thu, Feb 01, 2001 at 11:49:50PM +0100, Corinna Vinschen wrote:
> > On Wed, Jan 31, 2001 at 05:32:23PM -0600, mouring at etoh.eviladmin.org wrote:
> > > Current list of problems I know of:
> > > 
> > > * Cray & HP/UX -- sigaction vs signal
> > > * SCO w/ native compiler -- No sftp-server due to lack of 64bit
> > > * NeXTStep -- Report it's broken, no verification yet. (No compile
> > > 		warnings)
> > > * DG/UX -- regcomp/regexec issues(?)
> > > 
> > > ?? More ??
> > 
> > Yep. The openbsd-compat subdirectory doesn't build if the builddir
> > is not the sourcedir:
> >  [...]
> 
> ... and ssh-keyscan doesn't build:
> 
> /src/openssh/bin[65]$ make
> gcc -g -O2 -Wall -I. -I../src/openbsd-compat -I../src -DETCDIR=\"/etc\" -D_PATH_SSH_PROGRAM=\"/usr/bin/ssh\" -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/sbin/ssh-askpass\" -DHAVE_CONFIG_H -c ../src/ssh-keyscan.c
> ../src/ssh-keyscan.c:16: bsd-queue.h: No such file or directory
> make: *** [ssh-keyscan.o] Error 1
> 
> Where is bsd-queue.h??? I have the latest from CVS.
> 
Hmm.. Missed that one... It was moved to openbsd-compat/queue.h

Try this and see if it resolves the problem.  If it does I'll apply it to
the tree.

diff -ur openssh/ssh-keyscan.c ossh/ssh-keyscan.c
--- openssh/ssh-keyscan.c       Sun Jan 21 23:34:43 2001
+++ ossh/ssh-keyscan.c  Thu Feb  1 18:59:45 2001
@@ -13,7 +13,7 @@
 #if defined(HAVE_SYS_QUEUE_H)  &&  !defined(HAVE_BOGUS_SYS_QUEUE_H)
 #include <sys/queue.h>
 #else
-#include "bsd-queue.h"
+#include "openbsd-compat/queue.h"
 #endif
 #include <errno.h>