diff options
author | Damien Miller <djm@mindrot.org> | 2004-04-20 20:14:07 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-04-20 20:14:07 +1000 |
commit | 914420fe747a447748efd1aa94d03ba5942fa4be (patch) | |
tree | 862001973b17508b50ca871f545033e576462a2c | |
parent | 1a81258f4ee82e1f9d9d48a2ed93b93d6ce0485d (diff) |
- djm@cvs.openbsd.org 2004/04/19 21:51:49
[ssh.c]
fix idiot typo that i introduced in my last commit;
spotted by cschneid AT cschneid.com
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -16,6 +16,10 @@ | |||
16 | - jmc@cvs.openbsd.org 2004/04/19 16:12:14 | 16 | - jmc@cvs.openbsd.org 2004/04/19 16:12:14 |
17 | [ssh_config.5] | 17 | [ssh_config.5] |
18 | kill whitespace at eol; | 18 | kill whitespace at eol; |
19 | - djm@cvs.openbsd.org 2004/04/19 21:51:49 | ||
20 | [ssh.c] | ||
21 | fix idiot typo that i introduced in my last commit; | ||
22 | spotted by cschneid AT cschneid.com | ||
19 | - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for above change | 23 | - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for above change |
20 | 24 | ||
21 | 20040419 | 25 | 20040419 |
@@ -1021,4 +1025,4 @@ | |||
1021 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1025 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1022 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1026 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1023 | 1027 | ||
1024 | $Id: ChangeLog,v 1.3326 2004/04/20 10:13:32 djm Exp $ | 1028 | $Id: ChangeLog,v 1.3327 2004/04/20 10:14:07 djm Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.210 2004/04/18 23:10:26 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.211 2004/04/19 21:51:49 djm Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -526,7 +526,7 @@ again: | |||
526 | * file if the user specifies a config file on the command line. | 526 | * file if the user specifies a config file on the command line. |
527 | */ | 527 | */ |
528 | if (config != NULL) { | 528 | if (config != NULL) { |
529 | if (!read_config_file(config, host, &options, 0), 0) | 529 | if (!read_config_file(config, host, &options, 0)) |
530 | fatal("Can't open user config file %.100s: " | 530 | fatal("Can't open user config file %.100s: " |
531 | "%.100s", config, strerror(errno)); | 531 | "%.100s", config, strerror(errno)); |
532 | } else { | 532 | } else { |