summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-06-16 07:50:24 +1000
committerDamien Miller <djm@mindrot.org>2008-06-16 07:50:24 +1000
commit2a6284782de821a5c741d6bcd4f05cf650df34c5 (patch)
tree9be43a52de948e596972284f401649f3dc7ee372 /sshd.c
parent330c93f68a8cbbf416b2e2c9150e0a9b8964a51b (diff)
- OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2008/06/14 15:49:48 [sshd.c] wrap long line at 80 chars
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index f9b87ea1c..5b89231f1 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.360 2008/06/12 20:38:28 dtucker Exp $ */ 1/* $OpenBSD: sshd.c,v 1.361 2008/06/14 15:49:48 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1441,7 +1441,8 @@ main(int ac, char **av)
1441 * the parameters we need. If we're not doing an extended test, 1441 * the parameters we need. If we're not doing an extended test,
1442 * do not silently ignore connection test params. 1442 * do not silently ignore connection test params.
1443 */ 1443 */
1444 if (test_flag >= 2 && (test_user != NULL || test_host != NULL || test_addr != NULL) 1444 if (test_flag >= 2 &&
1445 (test_user != NULL || test_host != NULL || test_addr != NULL)
1445 && (test_user == NULL || test_host == NULL || test_addr == NULL)) 1446 && (test_user == NULL || test_host == NULL || test_addr == NULL))
1446 fatal("user, host and addr are all required when testing " 1447 fatal("user, host and addr are all required when testing "
1447 "Match configs"); 1448 "Match configs");