diff options
author | Damien Miller <djm@mindrot.org> | 2008-06-16 07:50:24 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-06-16 07:50:24 +1000 |
commit | 2a6284782de821a5c741d6bcd4f05cf650df34c5 (patch) | |
tree | 9be43a52de948e596972284f401649f3dc7ee372 | |
parent | 330c93f68a8cbbf416b2e2c9150e0a9b8964a51b (diff) |
- OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2008/06/14 15:49:48
[sshd.c]
wrap long line at 80 chars
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshd.c | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,9 @@ | |||
1 | 20080615 | 1 | 20080615 |
2 | - (dtucker) [configure.ac] Enable -fno-builtin-memset when using gcc. | 2 | - (dtucker) [configure.ac] Enable -fno-builtin-memset when using gcc. |
3 | - OpenBSD CVS Sync | ||
4 | - dtucker@cvs.openbsd.org 2008/06/14 15:49:48 | ||
5 | [sshd.c] | ||
6 | wrap long line at 80 chars | ||
3 | 7 | ||
4 | 20080614 | 8 | 20080614 |
5 | - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction | 9 | - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction |
@@ -4372,4 +4376,4 @@ | |||
4372 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4376 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4373 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4377 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4374 | 4378 | ||
4375 | $Id: ChangeLog,v 1.5012 2008/06/15 16:27:48 dtucker Exp $ | 4379 | $Id: ChangeLog,v 1.5013 2008/06/15 21:50:24 djm Exp $ |
@@ -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"); |