2 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index cdf467e39..2b2599023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
    - deraadt@cvs.openbsd.org 2006/03/19 18:56:41
      [clientloop.c progressmeter.c serverloop.c sshd.c]
      ARGSUSED for signal handlers
+   - deraadt@cvs.openbsd.org 2006/03/19 18:59:49
+     [ssh-keyscan.c]
+     please lint
 
 20060325
  - OpenBSD CVS Sync
@@ -4303,4 +4306,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4254 2006/03/26 02:59:20 djm Exp $
+$Id: ChangeLog,v 1.4255 2006/03/26 02:59:38 djm Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index fee6406be..c7296938b 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -128,7 +128,7 @@ Linebuf_alloc(const char *filename, void (*errfun) (const char *,...))
                 lb->stream = stdin;
         }
 
-        if (!(lb->buf = malloc(lb->size = LINEBUF_SIZE))) {
+        if (!(lb->buf = malloc((lb->size = LINEBUF_SIZE)))) {
                 if (errfun)
                         (*errfun) ("linebuf (%s): malloc failed\n", lb->filename);
                 xfree(lb);
@@ -603,7 +603,6 @@ conread(int s)
                         keyprint(c, keygrab_ssh1(c));
                         confree(s);
                         return;
-                        break;
                 default:
                         fatal("conread: invalid status %d", c->c_status);
                         break;