From 081573fe0f19581b6da9ff6c68feda5623608b76 Mon Sep 17 00:00:00 2001 From: djm Date: Sun, 15 Jun 2008 21:50:24 +0000 Subject: [PATCH] - OpenBSD CVS Sync - dtucker@cvs.openbsd.org 2008/06/14 15:49:48 [sshd.c] wrap long line at 80 chars --- ChangeLog | 4 ++++ sshd.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f39c62fc..53a0ab8a 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 diff --git a/sshd.c b/sshd.c index f9b87ea1..5b89231f 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 * Copyright (c) 1995 Tatu Ylonen , 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"); -- 2.45.2