2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 38fb74a44..5b1cb2966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 20080615
  - (dtucker) [configure.ac] Enable -fno-builtin-memset when using gcc.
+ - OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2008/06/14 15:49:48
+     [sshd.c]
+     wrap long line at 80 chars
 
 20080614
  - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction
@@ -4372,4 +4376,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5012 2008/06/15 16:27:48 dtucker Exp $
+$Id: ChangeLog,v 1.5013 2008/06/15 21:50:24 djm Exp $
diff --git a/sshd.c b/sshd.c
index f9b87ea1c..5b89231f1 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.360 2008/06/12 20:38:28 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.361 2008/06/14 15:49:48 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1441,7 +1441,8 @@ main(int ac, char **av)
          * the parameters we need.  If we're not doing an extended test,
          * do not silently ignore connection test params.
          */
-        if (test_flag >= 2 && (test_user != NULL || test_host != NULL || test_addr != NULL)
+        if (test_flag >= 2 &&
+           (test_user != NULL || test_host != NULL || test_addr != NULL)
             && (test_user == NULL || test_host == NULL || test_addr == NULL))
                 fatal("user, host and addr are all required when testing "
                    "Match configs");