OpenSSH 2.4?

[Corinna Vinschen]

On Thu, Feb 01, 2001 at 07:01:46PM -0600, mouring at etoh.eviladmin.org wrote:
> > ... 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>


That helps, thanks. However, includes.h does include bsd-*.h files
without explicitly mentioning the openbsd-compat directory, as in

#include "bsd-nextstep.h"

I think it's better doing it everywhere the same so I would change
ssh-keyscan.c this way:

diff -u -p -r1.14 ssh-keyscan.c
--- ssh-keyscan.c       2001/01/22 05:34:43     1.14
+++ ssh-keyscan.c       2001/02/02 07:02:41
@@ -13,7 +13,7 @@ RCSID("$OpenBSD: ssh-keyscan.c,v 1.11 20
 #if defined(HAVE_SYS_QUEUE_H)  &&  !defined(HAVE_BOGUS_SYS_QUEUE_H)
 #include <sys/queue.h>
 #else
-#include "bsd-queue.h"
+#include "queue.h"
 #endif
 #include <errno.h>


Corinna

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.
mailto:vinschen at redhat.com