diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-05 20:23:35 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-05 20:23:35 +0000 |
commit | 924144e6508df8ab6d8338920b697e62d827b966 (patch) | |
tree | ed595c2eaa4b2005caea07a8ab8ed11b52d40e4d | |
parent | a42694fa25683488b4dc44abc9dc8bb55414c99f (diff) |
- (bal) Too many <sys/queue.h> issues. Remove all workarounds and
using internal version only.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | acconfig.h | 3 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | openbsd-compat/fake-queue.h | 87 | ||||
-rw-r--r-- | sftp-client.c | 4 | ||||
-rw-r--r-- | ssh-agent.c | 7 | ||||
-rw-r--r-- | ssh-keyscan.c | 5 |
7 files changed, 91 insertions, 30 deletions
@@ -3,6 +3,8 @@ | |||
3 | Juha Yrjölä <jyrjola@cc.hut.fi> | 3 | Juha Yrjölä <jyrjola@cc.hut.fi> |
4 | - (bal) Minor documentation update to reflect smartcard library | 4 | - (bal) Minor documentation update to reflect smartcard library |
5 | support changes. | 5 | support changes. |
6 | - (bal) Too many <sys/queue.h> issues. Remove all workarounds and | ||
7 | using internal version only. | ||
6 | 8 | ||
7 | 20020404 | 9 | 20020404 |
8 | - (stevesk) [auth-pam.c auth-pam.h auth-passwd.c auth-sia.c auth-sia.h | 10 | - (stevesk) [auth-pam.c auth-pam.h auth-passwd.c auth-sia.c auth-sia.h |
@@ -8161,4 +8163,4 @@ | |||
8161 | - Wrote replacements for strlcpy and mkdtemp | 8163 | - Wrote replacements for strlcpy and mkdtemp |
8162 | - Released 1.0pre1 | 8164 | - Released 1.0pre1 |
8163 | 8165 | ||
8164 | $Id: ChangeLog,v 1.2023 2002/04/05 16:11:45 mouring Exp $ | 8166 | $Id: ChangeLog,v 1.2024 2002/04/05 20:23:35 mouring Exp $ |
diff --git a/acconfig.h b/acconfig.h index 67afad9aa..c7003fe55 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.125 2002/04/05 16:11:46 mouring Exp $ */ | 1 | /* $Id: acconfig.h,v 1.126 2002/04/05 20:23:37 mouring Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -14,7 +14,6 @@ | |||
14 | 14 | ||
15 | /* SCO workaround */ | 15 | /* SCO workaround */ |
16 | #undef BROKEN_SYS_TERMIO_H | 16 | #undef BROKEN_SYS_TERMIO_H |
17 | #undef HAVE_BOGUS_SYS_QUEUE_H | ||
18 | 17 | ||
19 | /* Define if you have SCO protected password database */ | 18 | /* Define if you have SCO protected password database */ |
20 | #undef HAVE_SCO_PROTECTED_PW | 19 | #undef HAVE_SCO_PROTECTED_PW |
diff --git a/configure.ac b/configure.ac index 6bd29254e..caa747f64 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.31 2002/04/05 16:11:46 mouring Exp $ | 1 | # $Id: configure.ac,v 1.32 2002/04/05 20:23:37 mouring Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -63,7 +63,6 @@ case "$host" in | |||
63 | AC_DEFINE(BROKEN_GETADDRINFO) | 63 | AC_DEFINE(BROKEN_GETADDRINFO) |
64 | dnl AIX handles lastlog as part of its login message | 64 | dnl AIX handles lastlog as part of its login message |
65 | AC_DEFINE(DISABLE_LASTLOG) | 65 | AC_DEFINE(DISABLE_LASTLOG) |
66 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | ||
67 | ;; | 66 | ;; |
68 | *-*-cygwin*) | 67 | *-*-cygwin*) |
69 | LIBS="$LIBS /usr/lib/textmode.o" | 68 | LIBS="$LIBS /usr/lib/textmode.o" |
@@ -123,7 +122,6 @@ case "$host" in | |||
123 | check_for_libcrypt_later=1 | 122 | check_for_libcrypt_later=1 |
124 | AC_DEFINE(DONT_TRY_OTHER_AF) | 123 | AC_DEFINE(DONT_TRY_OTHER_AF) |
125 | AC_DEFINE(PAM_TTY_KLUDGE) | 124 | AC_DEFINE(PAM_TTY_KLUDGE) |
126 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | ||
127 | inet6_default_4in6=yes | 125 | inet6_default_4in6=yes |
128 | ;; | 126 | ;; |
129 | mips-sony-bsd|mips-sony-newsos4) | 127 | mips-sony-bsd|mips-sony-newsos4) |
@@ -175,7 +173,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
175 | CPPFLAGS="$CPPFLAGS -DSUNOS4" | 173 | CPPFLAGS="$CPPFLAGS -DSUNOS4" |
176 | AC_CHECK_FUNCS(getpwanam) | 174 | AC_CHECK_FUNCS(getpwanam) |
177 | AC_DEFINE(PAM_SUN_CODEBASE) | 175 | AC_DEFINE(PAM_SUN_CODEBASE) |
178 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | ||
179 | conf_utmp_location=/etc/utmp | 176 | conf_utmp_location=/etc/utmp |
180 | conf_wtmp_location=/var/adm/wtmp | 177 | conf_wtmp_location=/var/adm/wtmp |
181 | conf_lastlog_location=/var/adm/lastlog | 178 | conf_lastlog_location=/var/adm/lastlog |
@@ -185,7 +182,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
185 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 182 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
186 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 183 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
187 | LIBS="$LIBS -lc89" | 184 | LIBS="$LIBS -lc89" |
188 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | ||
189 | AC_DEFINE(USE_PIPES) | 185 | AC_DEFINE(USE_PIPES) |
190 | ;; | 186 | ;; |
191 | *-sni-sysv*) | 187 | *-sni-sysv*) |
@@ -195,7 +191,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
195 | IPADDR_IN_DISPLAY=yes | 191 | IPADDR_IN_DISPLAY=yes |
196 | AC_DEFINE(USE_PIPES) | 192 | AC_DEFINE(USE_PIPES) |
197 | AC_DEFINE(IP_TOS_IS_BROKEN) | 193 | AC_DEFINE(IP_TOS_IS_BROKEN) |
198 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | ||
199 | # /usr/ucblib/libucb.a no longer needed on ReliantUNIX | 194 | # /usr/ucblib/libucb.a no longer needed on ReliantUNIX |
200 | # Attention: always take care to bind libsocket and libnsl before libc, | 195 | # Attention: always take care to bind libsocket and libnsl before libc, |
201 | # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog | 196 | # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog |
@@ -227,7 +222,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
227 | AC_DEFINE(USE_PIPES) | 222 | AC_DEFINE(USE_PIPES) |
228 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) | 223 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) |
229 | AC_DEFINE(DISABLE_SHADOW) | 224 | AC_DEFINE(DISABLE_SHADOW) |
230 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | ||
231 | AC_DEFINE(BROKEN_SAVED_UIDS) | 225 | AC_DEFINE(BROKEN_SAVED_UIDS) |
232 | AC_CHECK_FUNCS(getluid setluid) | 226 | AC_CHECK_FUNCS(getluid setluid) |
233 | MANTYPE=man | 227 | MANTYPE=man |
@@ -242,7 +236,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
242 | AC_DEFINE(USE_PIPES) | 236 | AC_DEFINE(USE_PIPES) |
243 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) | 237 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) |
244 | AC_DEFINE(DISABLE_SHADOW) | 238 | AC_DEFINE(DISABLE_SHADOW) |
245 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | ||
246 | AC_CHECK_FUNCS(getluid setluid) | 239 | AC_CHECK_FUNCS(getluid setluid) |
247 | MANTYPE=man | 240 | MANTYPE=man |
248 | ;; | 241 | ;; |
@@ -327,7 +320,7 @@ AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ | |||
327 | netinet/in_systm.h paths.h poll.h pty.h \ | 320 | netinet/in_systm.h paths.h poll.h pty.h \ |
328 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ | 321 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ |
329 | strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ | 322 | strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ |
330 | sys/poll.h sys/queue.h sys/select.h sys/stat.h \ | 323 | sys/poll.h sys/select.h sys/stat.h \ |
331 | sys/stropts.h sys/sysmacros.h sys/time.h \ | 324 | sys/stropts.h sys/sysmacros.h sys/time.h \ |
332 | sys/un.h time.h ttyent.h usersec.h \ | 325 | sys/un.h time.h ttyent.h usersec.h \ |
333 | util.h utime.h utmp.h utmpx.h) | 326 | util.h utime.h utmp.h utmpx.h) |
diff --git a/openbsd-compat/fake-queue.h b/openbsd-compat/fake-queue.h index c85bb240c..176fe3174 100644 --- a/openbsd-compat/fake-queue.h +++ b/openbsd-compat/fake-queue.h | |||
@@ -36,8 +36,89 @@ | |||
36 | * @(#)queue.h 8.5 (Berkeley) 8/20/94 | 36 | * @(#)queue.h 8.5 (Berkeley) 8/20/94 |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #ifndef _SYS_QUEUE_H_ | 39 | #ifndef _FAKE_QUEUE_H_ |
40 | #define _SYS_QUEUE_H_ | 40 | #define _FAKE_QUEUE_H_ |
41 | |||
42 | /* | ||
43 | * Ignore all <sys/queue.h> since older platforms have broken/incomplete | ||
44 | * <sys/queue.h> that are too hard to work around. | ||
45 | */ | ||
46 | #undef SLIST_HEAD | ||
47 | #undef SLIST_HEAD_INITIALIZER | ||
48 | #undef SLIST_ENTRY | ||
49 | #undef SLIST_FIRST | ||
50 | #undef SLIST_END | ||
51 | #undef SLIST_EMPTY | ||
52 | #undef SLIST_NEXT | ||
53 | #undef SLIST_FOREACH | ||
54 | #undef SLIST_INIT | ||
55 | #undef SLIST_INSERT_AFTER | ||
56 | #undef SLIST_INSERT_HEAD | ||
57 | #undef SLIST_REMOVE_HEAD | ||
58 | #undef SLIST_REMOVE | ||
59 | #undef LIST_HEAD | ||
60 | #undef LIST_HEAD_INITIALIZER | ||
61 | #undef LIST_ENTRY | ||
62 | #undef LIST_FIRST | ||
63 | #undef LIST_END | ||
64 | #undef LIST_EMPTY | ||
65 | #undef LIST_NEXT | ||
66 | #undef LIST_FOREACH | ||
67 | #undef LIST_INIT | ||
68 | #undef LIST_INSERT_AFTER | ||
69 | #undef LIST_INSERT_BEFORE | ||
70 | #undef LIST_INSERT_HEAD | ||
71 | #undef LIST_REMOVE | ||
72 | #undef LIST_REPLACE | ||
73 | #undef SIMPLEQ_HEAD | ||
74 | #undef SIMPLEQ_HEAD_INITIALIZER | ||
75 | #undef SIMPLEQ_ENTRY | ||
76 | #undef SIMPLEQ_FIRST | ||
77 | #undef SIMPLEQ_END | ||
78 | #undef SIMPLEQ_EMPTY | ||
79 | #undef SIMPLEQ_NEXT | ||
80 | #undef SIMPLEQ_FOREACH | ||
81 | #undef SIMPLEQ_INIT | ||
82 | #undef SIMPLEQ_INSERT_HEAD | ||
83 | #undef SIMPLEQ_INSERT_TAIL | ||
84 | #undef SIMPLEQ_INSERT_AFTER | ||
85 | #undef SIMPLEQ_REMOVE_HEAD | ||
86 | #undef TAILQ_HEAD | ||
87 | #undef TAILQ_HEAD_INITIALIZER | ||
88 | #undef TAILQ_ENTRY | ||
89 | #undef TAILQ_FIRST | ||
90 | #undef TAILQ_END | ||
91 | #undef TAILQ_NEXT | ||
92 | #undef TAILQ_LAST | ||
93 | #undef TAILQ_PREV | ||
94 | #undef TAILQ_EMPTY | ||
95 | #undef TAILQ_FOREACH | ||
96 | #undef TAILQ_FOREACH_REVERSE | ||
97 | #undef TAILQ_INIT | ||
98 | #undef TAILQ_INSERT_HEAD | ||
99 | #undef TAILQ_INSERT_TAIL | ||
100 | #undef TAILQ_INSERT_AFTER | ||
101 | #undef TAILQ_INSERT_BEFORE | ||
102 | #undef TAILQ_REMOVE | ||
103 | #undef TAILQ_REPLACE | ||
104 | #undef CIRCLEQ_HEAD | ||
105 | #undef CIRCLEQ_HEAD_INITIALIZER | ||
106 | #undef CIRCLEQ_ENTRY | ||
107 | #undef CIRCLEQ_FIRST | ||
108 | #undef CIRCLEQ_LAST | ||
109 | #undef CIRCLEQ_END | ||
110 | #undef CIRCLEQ_NEXT | ||
111 | #undef CIRCLEQ_PREV | ||
112 | #undef CIRCLEQ_EMPTY | ||
113 | #undef CIRCLEQ_FOREACH | ||
114 | #undef CIRCLEQ_FOREACH_REVERSE | ||
115 | #undef CIRCLEQ_INIT | ||
116 | #undef CIRCLEQ_INSERT_AFTER | ||
117 | #undef CIRCLEQ_INSERT_BEFORE | ||
118 | #undef CIRCLEQ_INSERT_HEAD | ||
119 | #undef CIRCLEQ_INSERT_TAIL | ||
120 | #undef CIRCLEQ_REMOVE | ||
121 | #undef CIRCLEQ_REPLACE | ||
41 | 122 | ||
42 | /* | 123 | /* |
43 | * This file defines five types of data structures: singly-linked lists, | 124 | * This file defines five types of data structures: singly-linked lists, |
@@ -500,4 +581,4 @@ struct { \ | |||
500 | (elm2)->field.cqe_prev->field.cqe_next = (elm2); \ | 581 | (elm2)->field.cqe_prev->field.cqe_next = (elm2); \ |
501 | } while (0) | 582 | } while (0) |
502 | 583 | ||
503 | #endif /* !_SYS_QUEUE_H_ */ | 584 | #endif /* !_FAKE_QUEUE_H_ */ |
diff --git a/sftp-client.c b/sftp-client.c index 254ef6f70..9fa8376e6 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -30,11 +30,7 @@ | |||
30 | #include "includes.h" | 30 | #include "includes.h" |
31 | RCSID("$OpenBSD: sftp-client.c,v 1.30 2002/04/01 22:07:17 markus Exp $"); | 31 | RCSID("$OpenBSD: sftp-client.c,v 1.30 2002/04/01 22:07:17 markus Exp $"); |
32 | 32 | ||
33 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) | ||
34 | #include <sys/queue.h> | ||
35 | #else | ||
36 | #include "openbsd-compat/fake-queue.h" | 33 | #include "openbsd-compat/fake-queue.h" |
37 | #endif | ||
38 | 34 | ||
39 | #include "buffer.h" | 35 | #include "buffer.h" |
40 | #include "bufaux.h" | 36 | #include "bufaux.h" |
diff --git a/ssh-agent.c b/ssh-agent.c index ccce33c3c..33596c47a 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -34,13 +34,8 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | RCSID("$OpenBSD: ssh-agent.c,v 1.85 2002/04/02 11:49:39 markus Exp $"); | ||
38 | |||
39 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) | ||
40 | #include <sys/queue.h> | ||
41 | #else | ||
42 | #include "openbsd-compat/fake-queue.h" | 37 | #include "openbsd-compat/fake-queue.h" |
43 | #endif | 38 | RCSID("$OpenBSD: ssh-agent.c,v 1.85 2002/04/02 11:49:39 markus Exp $"); |
44 | 39 | ||
45 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
46 | #include <openssl/md5.h> | 41 | #include <openssl/md5.h> |
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 824264c32..744f80249 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -9,12 +9,7 @@ | |||
9 | #include "includes.h" | 9 | #include "includes.h" |
10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.35 2002/03/04 18:30:23 stevesk Exp $"); | 10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.35 2002/03/04 18:30:23 stevesk Exp $"); |
11 | 11 | ||
12 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) | ||
13 | #include <sys/queue.h> | ||
14 | #else | ||
15 | #include "openbsd-compat/fake-queue.h" | 12 | #include "openbsd-compat/fake-queue.h" |
16 | #endif | ||
17 | #include <errno.h> | ||
18 | 13 | ||
19 | #include <openssl/bn.h> | 14 | #include <openssl/bn.h> |
20 | 15 | ||