summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fb320014..1e1a06c30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
25 - djm@cvs.openbsd.org 2011/08/02 23:13:01 25 - djm@cvs.openbsd.org 2011/08/02 23:13:01
26 [version.h] 26 [version.h]
27 crank now, release later 27 crank now, release later
28 - djm@cvs.openbsd.org 2011/08/02 23:15:03
29 [ssh.c]
30 typo in comment
28 31
2920110624 3220110624
30 - (djm) [configure.ac Makefile.in sandbox-darwin.c] Add a sandbox for 33 - (djm) [configure.ac Makefile.in sandbox-darwin.c] Add a sandbox for
diff --git a/ssh.c b/ssh.c
index 97eb9c0d4..c717dcf1d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.363 2011/06/22 22:08:42 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.364 2011/08/02 23:15:03 djm 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
@@ -706,7 +706,7 @@ main(int ac, char **av)
706 if (r > 0 && (size_t)r < sizeof(buf)) 706 if (r > 0 && (size_t)r < sizeof(buf))
707 (void)read_config_file(buf, host, &options, 1); 707 (void)read_config_file(buf, host, &options, 1);
708 708
709 /* Read systemwide configuration file after use config. */ 709 /* Read systemwide configuration file after user config. */
710 (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, 710 (void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
711 &options, 0); 711 &options, 0);
712 } 712 }