diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | TODO | 3 | ||||
-rw-r--r-- | acconfig.h | 1 | ||||
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | contrib/ssh-copy-id.1 | 2 | ||||
-rw-r--r-- | includes.h | 4 | ||||
-rw-r--r-- | ssh-keyscan.c | 2 |
7 files changed, 18 insertions, 5 deletions
@@ -1,7 +1,17 @@ | |||
1 | |||
2 | 20001229 | ||
3 | - (bal) Fixed spelling of 'authorized_keys' in ssh-copy-id.1 by Christian | ||
4 | Kurz <shorty@debain.org> | ||
5 | |||
1 | 20001228 | 6 | 20001228 |
2 | - (bal) Patch to add libutil.h to loginrec.c only if the platform has | 7 | - (bal) Patch to add libutil.h to loginrec.c only if the platform has |
3 | libutil.h. Suggested by Pekka Savola <pekka@netcore.fi> | 8 | libutil.h. Suggested by Pekka Savola <pekka@netcore.fi> |
4 | - (djm) Update to new x11-askpass in RPM spec | 9 | - (djm) Update to new x11-askpass in RPM spec |
10 | - (bal) SCO patch to not include <sys/queue.h> since it's unrelated | ||
11 | header. Patch by Tim Rice <tim@multitalents.net> | ||
12 | - Updated TODO w/ known HP/UX issue | ||
13 | - (bal) removed extra <netdb.h> noticed by Kevin Steves and removed the | ||
14 | bad reference to 'NeXT including it else were' on the #ifdef version. | ||
5 | 15 | ||
6 | 20001227 | 16 | 20001227 |
7 | - (bal) Typo in configure.in: entut?ent should be endut?ent. Suggested by | 17 | - (bal) Typo in configure.in: entut?ent should be endut?ent. Suggested by |
@@ -21,6 +21,9 @@ Programming: | |||
21 | 21 | ||
22 | - Build an automated test suite | 22 | - Build an automated test suite |
23 | 23 | ||
24 | - HP/UX has issues with SIGCHILD handling. There needs to be a wait() defined | ||
25 | before reinstall. Keven Steves <stevesk@pobox.com> | ||
26 | |||
24 | Documentation: | 27 | Documentation: |
25 | - More and better | 28 | - More and better |
26 | 29 | ||
diff --git a/acconfig.h b/acconfig.h index 21832fe2d..494c06f7d 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -12,6 +12,7 @@ | |||
12 | 12 | ||
13 | /* SCO workaround */ | 13 | /* SCO workaround */ |
14 | #undef BROKEN_SYS_TERMIO_H | 14 | #undef BROKEN_SYS_TERMIO_H |
15 | #undef HAVE_BOGUS_SYS_QUEUE_H | ||
15 | 16 | ||
16 | /* Define if you have SCO protected password database */ | 17 | /* Define if you have SCO protected password database */ |
17 | #undef HAVE_SCO_PROTECTED_PW | 18 | #undef HAVE_SCO_PROTECTED_PW |
diff --git a/configure.in b/configure.in index 08cd9e125..7fade4efd 100644 --- a/configure.in +++ b/configure.in | |||
@@ -230,6 +230,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
230 | rsh_path="/usr/bin/rcmd" | 230 | rsh_path="/usr/bin/rcmd" |
231 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) | 231 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) |
232 | AC_DEFINE(DISABLE_SHADOW) | 232 | AC_DEFINE(DISABLE_SHADOW) |
233 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | ||
233 | ;; | 234 | ;; |
234 | *-dec-osf*) | 235 | *-dec-osf*) |
235 | # This is untested | 236 | # This is untested |
diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1 index df4f88d9b..b331fa149 100644 --- a/contrib/ssh-copy-id.1 +++ b/contrib/ssh-copy-id.1 | |||
@@ -58,7 +58,7 @@ option is used, or the | |||
58 | produced no output, then it uses the contents of the identity | 58 | produced no output, then it uses the contents of the identity |
59 | file. Once it has one or more fingerprints (by whatever means) it | 59 | file. Once it has one or more fingerprints (by whatever means) it |
60 | uses ssh to append them to | 60 | uses ssh to append them to |
61 | .B ~/.ssh/authorised_keys | 61 | .B ~/.ssh/authorized_keys |
62 | on the remote machine (creating the file, and directory, if necessary) | 62 | on the remote machine (creating the file, and directory, if necessary) |
63 | 63 | ||
64 | .SH "SEE ALSO" | 64 | .SH "SEE ALSO" |
diff --git a/includes.h b/includes.h index 916066326..c3309a501 100644 --- a/includes.h +++ b/includes.h | |||
@@ -32,7 +32,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
32 | #include <netinet/tcp.h> | 32 | #include <netinet/tcp.h> |
33 | #endif | 33 | #endif |
34 | #include <arpa/inet.h> | 34 | #include <arpa/inet.h> |
35 | #include <netdb.h> | ||
36 | 35 | ||
37 | #include <stdio.h> | 36 | #include <stdio.h> |
38 | #include <ctype.h> | 37 | #include <ctype.h> |
@@ -56,8 +55,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
56 | #ifdef HAVE_NETGROUP_H | 55 | #ifdef HAVE_NETGROUP_H |
57 | # include <netgroup.h> | 56 | # include <netgroup.h> |
58 | #endif | 57 | #endif |
59 | #if defined(HAVE_NETDB_H) && !defined(HAVE_NEXT) | 58 | #if defined(HAVE_NETDB_H) |
60 | /* Next includes this as part of another header */ | ||
61 | # include <netdb.h> | 59 | # include <netdb.h> |
62 | #endif | 60 | #endif |
63 | #ifdef HAVE_ENDIAN_H | 61 | #ifdef HAVE_ENDIAN_H |
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index f630e8c75..68593fe75 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.6 2000/12/19 23:17:58 markus Exp $"); | 11 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.6 2000/12/19 23:17:58 markus Exp $"); |
12 | 12 | ||
13 | #ifdef HAVE_SYS_QUEUE_H | 13 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) |
14 | #include <sys/queue.h> | 14 | #include <sys/queue.h> |
15 | #else | 15 | #else |
16 | #include "bsd-queue.h" | 16 | #include "bsd-queue.h" |