summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-08-20 19:04:51 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-08-20 19:04:51 +0000
commit479b476af623835b551ace88463665e6be7c8873 (patch)
treec447f42008d3b4ab848001ab7642d032f336b4fc
parent3541f18e10fd43aacb04261991c5ffa4819d53c6 (diff)
- stevesk@cvs.openbsd.org 2002/08/17 23:55:01
[ssh_config.5] ordered list here
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.516
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c9037852..014fedc18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
36 - stevesk@cvs.openbsd.org 2002/08/17 23:07:14 36 - stevesk@cvs.openbsd.org 2002/08/17 23:07:14
37 [ssh.1] 37 [ssh.1]
38 ForwardAgent has defaulted to no for over 2 years; be more clear here. 38 ForwardAgent has defaulted to no for over 2 years; be more clear here.
39 - stevesk@cvs.openbsd.org 2002/08/17 23:55:01
40 [ssh_config.5]
41 ordered list here
39 42
4020020813 4320020813
41 - (tim) [configure.ac] Display OpenSSL header/library version. 44 - (tim) [configure.ac] Display OpenSSL header/library version.
@@ -1533,4 +1536,4 @@
1533 - (stevesk) entropy.c: typo in debug message 1536 - (stevesk) entropy.c: typo in debug message
1534 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1537 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1535 1538
1536$Id: ChangeLog,v 1.2424 2002/08/20 19:03:20 mouring Exp $ 1539$Id: ChangeLog,v 1.2425 2002/08/20 19:04:51 mouring Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 53cb0fe97..857cc9640 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.1 2002/06/20 19:56:07 stevesk Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.2 2002/08/17 23:55:01 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -50,10 +50,16 @@
50.Nm ssh 50.Nm ssh
51obtains configuration data from the following sources in 51obtains configuration data from the following sources in
52the following order: 52the following order:
53command line options, user's configuration file 53.Bl -enum -offset indent -compact
54.Pq Pa $HOME/.ssh/config , 54.It
55and system-wide configuration file 55command-line options
56.Pq Pa /etc/ssh/ssh_config . 56.It
57user's configuration file
58.Pq Pa $HOME/.ssh/config
59.It
60system-wide configuration file
61.Pq Pa /etc/ssh/ssh_config
62.El
57.Pp 63.Pp
58For each parameter, the first obtained value 64For each parameter, the first obtained value
59will be used. 65will be used.