summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--TODO3
-rw-r--r--acconfig.h1
-rw-r--r--configure.in1
-rw-r--r--contrib/ssh-copy-id.12
-rw-r--r--includes.h4
-rw-r--r--ssh-keyscan.c2
7 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 588c5931..8f13a237 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
+
+20001229
+ - (bal) Fixed spelling of 'authorized_keys' in ssh-copy-id.1 by Christian
+ Kurz <shorty@debain.org>
+
20001228
- (bal) Patch to add libutil.h to loginrec.c only if the platform has
libutil.h. Suggested by Pekka Savola <pekka@netcore.fi>
- (djm) Update to new x11-askpass in RPM spec
+ - (bal) SCO patch to not include <sys/queue.h> since it's unrelated
+ header. Patch by Tim Rice <tim@multitalents.net>
+ - Updated TODO w/ known HP/UX issue
+ - (bal) removed extra <netdb.h> noticed by Kevin Steves and removed the
+ bad reference to 'NeXT including it else were' on the #ifdef version.
20001227
- (bal) Typo in configure.in: entut?ent should be endut?ent. Suggested by
diff --git a/TODO b/TODO
index 61e6aed6..c28a3e12 100644
--- a/TODO
+++ b/TODO
@@ -21,6 +21,9 @@ Programming:
- Build an automated test suite
+- HP/UX has issues with SIGCHILD handling. There needs to be a wait() defined
+ before reinstall. Keven Steves <stevesk@pobox.com>
+
Documentation:
- More and better
diff --git a/acconfig.h b/acconfig.h
index 21832fe2..494c06f7 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -12,6 +12,7 @@
/* 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
diff --git a/configure.in b/configure.in
index 08cd9e12..7fade4ef 100644
--- a/configure.in
+++ b/configure.in
@@ -230,6 +230,7 @@ mips-sony-bsd|mips-sony-newsos4)
rsh_path="/usr/bin/rcmd"
AC_DEFINE(HAVE_SCO_PROTECTED_PW)
AC_DEFINE(DISABLE_SHADOW)
+ AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
;;
*-dec-osf*)
# This is untested
diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1
index df4f88d9..b331fa14 100644
--- a/contrib/ssh-copy-id.1
+++ b/contrib/ssh-copy-id.1
@@ -58,7 +58,7 @@ option is used, or the
produced no output, then it uses the contents of the identity
file. Once it has one or more fingerprints (by whatever means) it
uses ssh to append them to
-.B ~/.ssh/authorised_keys
+.B ~/.ssh/authorized_keys
on the remote machine (creating the file, and directory, if necessary)
.SH "SEE ALSO"
diff --git a/includes.h b/includes.h
index 91606632..c3309a50 100644
--- a/includes.h
+++ b/includes.h
@@ -32,7 +32,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#include <netinet/tcp.h>
#endif
#include <arpa/inet.h>
-#include <netdb.h>
#include <stdio.h>
#include <ctype.h>
@@ -56,8 +55,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#ifdef HAVE_NETGROUP_H
# include <netgroup.h>
#endif
-#if defined(HAVE_NETDB_H) && !defined(HAVE_NEXT)
-/* Next includes this as part of another header */
+#if defined(HAVE_NETDB_H)
# include <netdb.h>
#endif
#ifdef HAVE_ENDIAN_H
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index f630e8c7..68593fe7 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -10,7 +10,7 @@
#include "includes.h"
RCSID("$OpenBSD: ssh-keyscan.c,v 1.6 2000/12/19 23:17:58 markus Exp $");
-#ifdef HAVE_SYS_QUEUE_H
+#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
#include <sys/queue.h>
#else
#include "bsd-queue.h"