5 files changed, 14 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 34019c237..8fcd17d06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
  - Calls to pam_setcred, patch from Nalin Dahyabhai 
    <nalin@thermo.stat.ncsu.edu>
  - Detect missing size_t and typedef it.
+ - Rename helper.[ch] to (more appropriate) bsd-misc.[ch]
+ - Minor Makefile cleaning
 
 19991228
  - Replacement for getpagesize() for systems which lack it
diff --git a/Makefile.in b/Makefile.in
index 72ac0a81e..050032277 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,20 +33,19 @@ GNOME_LIBS=`gnome-config --libs gnome gnomeui`
 
 OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \
   auth-rhosts.o auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o \
-  bsd-login.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o \
-  bufaux.o buffer.o canohost.o channels.o cipher.o clientloop.o \
-  compress.o crc32.o deattack.o helper.o helper.o hostfile.o \
+  bsd-login.o bsd-misc.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o \
+  bsd-strlcpy.o bufaux.o buffer.o canohost.o channels.o cipher.o \
+  clientloop.o compress.o crc32.o deattack.o hostfile.o \
   log-client.o login.o log-server.o match.o md5crypt.o mpaux.o \
   packet.o pty.o radix.o readconf.o readpass.o rsa.o servconf.o \
   serverloop.o sshconnect.o tildexpand.o ttymodes.o uidswap.o \
   xmalloc.o 
 
-LIBOBJS= atomicio.o authfd.o authfile.o bsd-daemon.o bsd-mktemp.o \
-  bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o \
-  buffer.o canohost.o channels.o cipher.o compat.o \
-  compress.o crc32.o deattack.o fingerprint.o helper.o \
-  hostfile.o log.o match.o mpaux.o nchan.o packet.o \
-  radix.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o \
+LIBOBJS= atomicio.o authfd.o authfile.o bsd-daemon.o bsd-misc.o \
+  bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o \
+  buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o \
+  deattack.o fingerprint.o hostfile.o log.o match.o mpaux.o nchan.o \
+  packet.o radix.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o \
   xmalloc.o 
 
 all: $(OBJS) $(TARGETS) manpages
@@ -90,8 +89,7 @@ clean:
                 *.1 *.8 sshd_config ssh_config
 
 manpages:
-        $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.1.in $(srcdir)/*.8.in \
-                $(srcdir)/ssh_config.in $(srcdir)/sshd_config.in
+        $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.[18].in $(srcdir)/ssh*_config.in
 
 install: all
         $(INSTALL) -d $(bindir)
diff --git a/README b/README
index fcf22f0d0..b09cc8f02 100644
--- a/README
+++ b/README
@@ -57,7 +57,7 @@ This version of SSH is based upon code retrieved from the OpenBSD CVS
 repository on 1999-11-09 which in turn was based on the last free 
 version of SSH released by Tatu Ylonen.
 
-Code in helper.[ch] and gnome-ssh-askpass.c is Copyright 1999 
+Code in bsd-misc.[ch] and gnome-ssh-askpass.c is Copyright 1999 
 Internet Business Solutions and is released under a X11-style 
 license (see source files for details).
 
diff --git a/bsd-mktemp.c b/bsd-mktemp.c
index cdef62da2..7c02ea1a2 100644
--- a/bsd-mktemp.c
+++ b/bsd-mktemp.c
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: mktemp.c,v 1.13 1998/06/30 23:03:13 deraadt Exp
 #include <ctype.h>
 #include <unistd.h>
 
-#include "helper.h"
+#include "bsd-misc.h"
 
 static int _gettemp(char *, int *, int, int);
 
diff --git a/includes.h b/includes.h
index 7203d08c9..3fe76553b 100644
--- a/includes.h
+++ b/includes.h
@@ -81,7 +81,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #endif
 
 #include "version.h"
-#include "helper.h"
+#include "bsd-misc.h"
 #include "bsd-strlcpy.h"
 #include "bsd-strlcat.h"
 #include "bsd-mktemp.h"