It is too late by time it tries to load it in the individual C files
for BSD/OS. It has to be loaded before #include <netinet/in.h> in
defines.h or else 4.2 fails.
- Ben
On Mon, 11 Mar 2002, Kevin Steves wrote:
> removes HAVE_BOGUS_SYS_QUEUE_H and always use our queue.h. ok?
>
> Index: acconfig.h
> ==================================================================> RCS
file: /var/cvs/openssh/acconfig.h,v
> retrieving revision 1.122
> diff -u -r1.122 acconfig.h
> --- acconfig.h 26 Feb 2002 16:40:49 -0000 1.122
> +++ acconfig.h 12 Mar 2002 02:11:39 -0000
> @@ -14,7 +14,6 @@
>
> /* SCO workaround */
> #undef BROKEN_SYS_TERMIO_H
> -#undef HAVE_BOGUS_SYS_QUEUE_H
>
> /* Define if you have SCO protected password database */
> #undef HAVE_SCO_PROTECTED_PW
> Index: configure.ac
> ==================================================================> RCS
file: /var/cvs/openssh/configure.ac,v
> retrieving revision 1.25
> diff -u -r1.25 configure.ac
> --- configure.ac 8 Mar 2002 03:50:58 -0000 1.25
> +++ configure.ac 12 Mar 2002 02:11:54 -0000
> @@ -63,7 +63,6 @@
> AC_DEFINE(BROKEN_GETADDRINFO)
> dnl AIX handles lastlog as part of its login message
> AC_DEFINE(DISABLE_LASTLOG)
> - AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
> ;;
> *-*-cygwin*)
> LIBS="$LIBS /usr/lib/textmode.o"
> @@ -123,7 +122,6 @@
> check_for_libcrypt_later=1
> AC_DEFINE(DONT_TRY_OTHER_AF)
> AC_DEFINE(PAM_TTY_KLUDGE)
> - AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
> inet6_default_4in6=yes
> ;;
> mips-sony-bsd|mips-sony-newsos4)
> @@ -175,7 +173,6 @@
> CPPFLAGS="$CPPFLAGS -DSUNOS4"
> AC_CHECK_FUNCS(getpwanam)
> AC_DEFINE(PAM_SUN_CODEBASE)
> - AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
> conf_utmp_location=/etc/utmp
> conf_wtmp_location=/var/adm/wtmp
> conf_lastlog_location=/var/adm/lastlog
> @@ -185,7 +182,6 @@
> CPPFLAGS="$CPPFLAGS -I/usr/local/include"
> LDFLAGS="$LDFLAGS -L/usr/local/lib"
> LIBS="$LIBS -lc89"
> - AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
> AC_DEFINE(USE_PIPES)
> ;;
> *-sni-sysv*)
> @@ -195,7 +191,6 @@
> IPADDR_IN_DISPLAY=yes
> AC_DEFINE(USE_PIPES)
> AC_DEFINE(IP_TOS_IS_BROKEN)
> - AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
> # /usr/ucblib/libucb.a no longer needed on ReliantUNIX
> # Attention: always take care to bind libsocket and libnsl before libc,
> # otherwise you will find lots of "SIOCGPGRP errno 22" on
syslog
> @@ -227,7 +222,6 @@
> AC_DEFINE(USE_PIPES)
> AC_DEFINE(HAVE_SCO_PROTECTED_PW)
> AC_DEFINE(DISABLE_SHADOW)
> - AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
> AC_DEFINE(BROKEN_SAVED_UIDS)
> AC_CHECK_FUNCS(getluid setluid)
> MANTYPE=man
> @@ -242,7 +236,6 @@
> AC_DEFINE(USE_PIPES)
> AC_DEFINE(HAVE_SCO_PROTECTED_PW)
> AC_DEFINE(DISABLE_SHADOW)
> - AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
> AC_CHECK_FUNCS(getluid setluid)
> MANTYPE=man
> ;;
> @@ -327,7 +320,7 @@
> netinet/in_systm.h paths.h poll.h pty.h \
> rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
> strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
> - sys/poll.h sys/queue.h sys/select.h sys/stat.h \
> + sys/poll.h sys/select.h sys/stat.h \
> sys/stropts.h sys/sysmacros.h sys/time.h \
> sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \
> util.h utime.h utmp.h utmpx.h)
> Index: sftp-client.c
> ==================================================================> RCS
file: /var/cvs/openssh/sftp-client.c,v
> retrieving revision 1.24
> diff -u -r1.24 sftp-client.c
> --- sftp-client.c 26 Feb 2002 18:02:44 -0000 1.24
> +++ sftp-client.c 12 Mar 2002 02:12:01 -0000
> @@ -30,11 +30,7 @@
> #include "includes.h"
> RCSID("$OpenBSD: sftp-client.c,v 1.24 2002/02/24 16:57:19 markus Exp
$");
>
> -#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
> -#include <sys/queue.h>
> -#else
> #include "openbsd-compat/fake-queue.h"
> -#endif
>
> #include "buffer.h"
> #include "bufaux.h"
> Index: ssh-agent.c
> ==================================================================> RCS
file: /var/cvs/openssh/ssh-agent.c,v
> retrieving revision 1.85
> diff -u -r1.85 ssh-agent.c
> --- ssh-agent.c 5 Mar 2002 18:59:45 -0000 1.85
> +++ ssh-agent.c 12 Mar 2002 02:12:08 -0000
> @@ -34,13 +34,8 @@
> */
>
> #include "includes.h"
> -RCSID("$OpenBSD: ssh-agent.c,v 1.82 2002/03/04 17:27:39 stevesk Exp
$");
> -
> -#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
> -#include <sys/queue.h>
> -#else
> #include "openbsd-compat/fake-queue.h"
> -#endif
> +RCSID("$OpenBSD: ssh-agent.c,v 1.82 2002/03/04 17:27:39 stevesk Exp
$");
>
> #include <openssl/evp.h>
> #include <openssl/md5.h>
> Index: ssh-keyscan.c
> ==================================================================> RCS
file: /var/cvs/openssh/ssh-keyscan.c,v
> retrieving revision 1.42
> diff -u -r1.42 ssh-keyscan.c
> --- ssh-keyscan.c 5 Mar 2002 01:54:53 -0000 1.42
> +++ ssh-keyscan.c 12 Mar 2002 02:12:11 -0000
> @@ -9,11 +9,7 @@
> #include "includes.h"
> RCSID("$OpenBSD: ssh-keyscan.c,v 1.35 2002/03/04 18:30:23 stevesk Exp
$");
>
> -#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
> -#include <sys/queue.h>
> -#else
> #include "openbsd-compat/fake-queue.h"
> -#endif
> #include <errno.h>
>
> #include <openssl/bn.h>
>
> _______________________________________________
> openssh-unix-dev at mindrot.org mailing list
> http://www.mindrot.org/mailman/listinfo/openssh-unix-dev
>