head	1.44;
access;
symbols
	RELENG_8_4:1.43.0.2
	RELENG_9_1_0_RELEASE:1.39.2.1.4.2
	RELENG_9_1:1.39.2.1.0.4
	RELENG_9_1_BP:1.39.2.1
	RELENG_8_3_0_RELEASE:1.34.2.2.6.1
	RELENG_8_3:1.34.2.2.0.6
	RELENG_8_3_BP:1.34.2.2
	RELENG_9_0_0_RELEASE:1.39.2.1.2.1
	RELENG_9_0:1.39.2.1.0.2
	RELENG_9_0_BP:1.39.2.1
	RELENG_9:1.39.0.2
	RELENG_9_BP:1.39
	RELENG_7_4_0_RELEASE:1.32.2.1.8.1
	RELENG_8_2_0_RELEASE:1.34.2.2.4.1
	RELENG_7_4:1.32.2.1.0.8
	RELENG_7_4_BP:1.32.2.1
	RELENG_8_2:1.34.2.2.0.4
	RELENG_8_2_BP:1.34.2.2
	RELENG_8_1_0_RELEASE:1.34.2.2.2.1
	RELENG_8_1:1.34.2.2.0.2
	RELENG_8_1_BP:1.34.2.2
	RELENG_7_3_0_RELEASE:1.32.2.1.6.1
	RELENG_7_3:1.32.2.1.0.6
	RELENG_7_3_BP:1.32.2.1
	RELENG_8_0_0_RELEASE:1.34.2.1.2.1
	RELENG_8_0:1.34.2.1.0.2
	RELENG_8_0_BP:1.34.2.1
	RELENG_8:1.34.0.2
	RELENG_8_BP:1.34
	RELENG_7_2_0_RELEASE:1.32.2.1.4.1
	RELENG_7_2:1.32.2.1.0.4
	RELENG_7_2_BP:1.32.2.1
	RELENG_7_1_0_RELEASE:1.32.2.1.2.1
	RELENG_6_4_0_RELEASE:1.27.2.4.6.1
	RELENG_7_1:1.32.2.1.0.2
	RELENG_7_1_BP:1.32.2.1
	RELENG_6_4:1.27.2.4.0.6
	RELENG_6_4_BP:1.27.2.4
	RELENG_7_0_0_RELEASE:1.32
	RELENG_6_3_0_RELEASE:1.27.2.4
	RELENG_7_0:1.32.0.4
	RELENG_7_0_BP:1.32
	RELENG_6_3:1.27.2.4.0.4
	RELENG_6_3_BP:1.27.2.4
	RELENG_7:1.32.0.2
	RELENG_7_BP:1.32
	RELENG_6_2_0_RELEASE:1.27.2.4
	RELENG_6_2:1.27.2.4.0.2
	RELENG_6_2_BP:1.27.2.4
	OpenSSH_4_5p1:1.1.1.11
	OpenSSH_4_4p1:1.1.1.11
	RELENG_5_5_0_RELEASE:1.25.2.1
	RELENG_5_5:1.25.2.1.0.2
	RELENG_5_5_BP:1.25.2.1
	RELENG_6_1_0_RELEASE:1.27.2.1
	RELENG_6_1:1.27.2.1.0.4
	RELENG_6_1_BP:1.27.2.1
	OpenSSH_4_3p1:1.1.1.10
	RELENG_6_0_0_RELEASE:1.27.2.1
	RELENG_6_0:1.27.2.1.0.2
	RELENG_6_0_BP:1.27.2.1
	OpenSSH_4_2p1:1.1.1.9
	RELENG_6:1.27.0.2
	RELENG_6_BP:1.27
	OpenSSH_4_1p1:1.1.1.9
	OpenSSH_4_0p1:1.1.1.9
	RELENG_5_4_0_RELEASE:1.25
	RELENG_5_4:1.25.0.6
	RELENG_5_4_BP:1.25
	RELENG_4_11_0_RELEASE:1.2.2.9
	RELENG_4_11:1.2.2.9.0.6
	RELENG_4_11_BP:1.2.2.9
	OpenSSH_3_9p1:1.1.1.8
	RELENG_5_3_0_RELEASE:1.25
	RELENG_5_3:1.25.0.4
	RELENG_5_3_BP:1.25
	RELENG_5:1.25.0.2
	RELENG_5_BP:1.25
	RELENG_4_10_0_RELEASE:1.2.2.9
	RELENG_4_10:1.2.2.9.0.4
	RELENG_4_10_BP:1.2.2.9
	OpenSSH_3_8_1p1:1.1.1.8
	OpenSSH_3_8p1:1.1.1.8
	RELENG_5_2_1_RELEASE:1.22
	RELENG_5_2_0_RELEASE:1.22
	OpenSSH_3_7_1p2:1.1.1.8
	RELENG_5_2:1.22.0.2
	RELENG_5_2_BP:1.22
	RELENG_4_9_0_RELEASE:1.2.2.9
	RELENG_4_9:1.2.2.9.0.2
	RELENG_4_9_BP:1.2.2.9
	RELENG_5_1_0_RELEASE:1.21
	RELENG_5_1:1.21.0.2
	RELENG_5_1_BP:1.21
	OpenSSH_3_6_1p1:1.1.1.7
	RELENG_4_8_0_RELEASE:1.2.2.8
	RELENG_4_8:1.2.2.8.0.2
	RELENG_4_8_BP:1.2.2.8
	RELENG_5_0_0_RELEASE:1.19
	RELENG_5_0:1.19.0.2
	RELENG_5_0_BP:1.19
	OpenSSH_3_5p1:1.1.1.7
	OPENSSH:1.1.1
	RELENG_4_7_0_RELEASE:1.2.2.6
	RELENG_4_7:1.2.2.6.0.2
	RELENG_4_7_BP:1.2.2.6
	RELENG_4_6_2_RELEASE:1.2.2.4.4.1
	RELENG_4_6_1_RELEASE:1.2.2.4.4.1
	OpenSSH_3_4p1:1.1.1.6
	OpenSSH_3_3p1:1.1.1.6
	OpenSSH_3_3:1.1.1.6
	RELENG_4_6_0_RELEASE:1.2.2.4
	RELENG_4_6:1.2.2.4.0.4
	RELENG_4_6_BP:1.2.2.4
	OpenSSH_3_1:1.1.1.5
	RELENG_4_5_0_RELEASE:1.2.2.4
	RELENG_4_5:1.2.2.4.0.2
	RELENG_4_5_BP:1.2.2.4
	RELENG_4_4_0_RELEASE:1.2.2.3
	RELENG_4_4:1.2.2.3.0.4
	RELENG_4_4_BP:1.2.2.3
	OpenSSH_2_9:1.1.1.4
	RELENG_4_3_0_RELEASE:1.2.2.3
	RELENG_4_3:1.2.2.3.0.2
	RELENG_4_3_BP:1.2.2.3
	OpenSSH_2_3_0:1.1.1.3
	OpenBSD:1.1.1
	RELENG_4_2_0_RELEASE:1.2.2.3
	RELENG_4_1_1_RELEASE:1.2.2.2
	v_2_2_0_2000_09_09:1.1.1.3
	PRE_SMPNG:1.5
	RELENG_4_1_0_RELEASE:1.2.2.1
	v_2_1_0_2000_05_30:1.1.1.2
	v_2_1:1.1.1.2
	v_1_2_3_2000_03_25:1.1.1.1
	RELENG_4_0_0_RELEASE:1.2
	RELENG_4:1.2.0.2
	RELENG_4_BP:1.2
	v_1_2_2000_02_24:1.1.1.1
	OPENBSD:1.1.1;
locks; strict;
comment	@# @;


1.44
date	2013.05.18.00.28.34;	author svnexp;	state Exp;
branches;
next	1.43;

1.43
date	2013.03.23.02.26.25;	author svnexp;	state Exp;
branches
	1.43.2.1;
next	1.42;

1.42
date	2012.11.17.01.49.01;	author svnexp;	state Exp;
branches;
next	1.41;

1.41
date	2012.09.03.16.51.41;	author des;	state Exp;
branches;
next	1.40;

1.40
date	2011.10.05.22.08.17;	author des;	state Exp;
branches;
next	1.39;

1.39
date	2011.05.04.07.34.44;	author des;	state Exp;
branches
	1.39.2.1;
next	1.38;

1.38
date	2010.11.11.11.46.19;	author des;	state Exp;
branches;
next	1.37;

1.37
date	2010.04.28.10.36.33;	author des;	state Exp;
branches;
next	1.36;

1.36
date	2010.03.09.19.16.43;	author des;	state Exp;
branches;
next	1.35;

1.35
date	2009.10.01.17.12.52;	author des;	state Exp;
branches;
next	1.34;

1.34
date	2009.05.22.18.46.28;	author des;	state Exp;
branches
	1.34.2.1;
next	1.33;

1.33
date	2008.08.01.02.48.36;	author des;	state Exp;
branches;
next	1.32;

1.32
date	2006.11.10.16.52.41;	author des;	state Exp;
branches
	1.32.2.1;
next	1.31;

1.31
date	2006.09.30.13.39.07;	author des;	state Exp;
branches;
next	1.30;

1.30
date	2006.09.30.13.38.05;	author des;	state Exp;
branches;
next	1.29;

1.29
date	2006.03.22.20.41.37;	author des;	state Exp;
branches;
next	1.28;

1.28
date	2005.09.03.07.04.23;	author des;	state Exp;
branches;
next	1.27;

1.27
date	2005.06.05.15.46.07;	author des;	state Exp;
branches
	1.27.2.1;
next	1.26;

1.26
date	2004.10.28.16.11.28;	author des;	state Exp;
branches;
next	1.25;

1.25
date	2004.04.20.09.37.28;	author des;	state Exp;
branches
	1.25.2.1
	1.25.4.1
	1.25.6.1;
next	1.24;

1.24
date	2004.02.26.11.54.03;	author des;	state Exp;
branches;
next	1.23;

1.23
date	2004.01.07.11.16.24;	author des;	state Exp;
branches;
next	1.22;

1.22
date	2003.09.24.19.20.23;	author des;	state Exp;
branches;
next	1.21;

1.21
date	2003.04.23.17.10.53;	author des;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2003.02.11.12.11.15;	author des;	state Exp;
branches;
next	1.19;

1.19
date	2002.11.05.17.17.09;	author des;	state Exp;
branches;
next	1.18;

1.18
date	2002.10.29.10.16.02;	author des;	state Exp;
branches;
next	1.17;

1.17
date	2002.07.25.15.59.40;	author fanf;	state Exp;
branches;
next	1.16;

1.16
date	2002.06.30.10.32.09;	author des;	state Exp;
branches;
next	1.15;

1.15
date	2002.06.29.10.55.18;	author des;	state Exp;
branches;
next	1.14;

1.14
date	2002.06.27.22.42.07;	author des;	state Exp;
branches;
next	1.13;

1.13
date	2002.06.23.16.09.08;	author des;	state Exp;
branches;
next	1.12;

1.12
date	2002.05.01.22.39.53;	author obrien;	state Exp;
branches;
next	1.11;

1.11
date	2002.04.02.21.53.54;	author des;	state Exp;
branches;
next	1.10;

1.10
date	2002.03.18.10.09.43;	author des;	state Exp;
branches;
next	1.9;

1.9
date	2001.05.24.07.22.08;	author obrien;	state Exp;
branches;
next	1.8;

1.8
date	2001.05.04.04.14.23;	author green;	state Exp;
branches;
next	1.7;

1.7
date	2000.12.05.02.55.12;	author green;	state Exp;
branches;
next	1.6;

1.6
date	2000.09.10.09.35.38;	author kris;	state Exp;
branches;
next	1.5;

1.5
date	2000.07.16.05.52.25;	author peter;	state Exp;
branches;
next	1.4;

1.4
date	2000.07.11.09.39.34;	author peter;	state Exp;
branches;
next	1.3;

1.3
date	2000.05.15.05.24.25;	author kris;	state Exp;
branches;
next	1.2;

1.2
date	2000.02.24.15.29.41;	author markm;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2000.02.24.14.29.46;	author markm;	state Exp;
branches
	1.1.1.1;
next	;

1.43.2.1
date	2013.03.23.02.26.25;	author svnexp;	state dead;
branches;
next	1.43.2.2;

1.43.2.2
date	2013.03.28.13.02.26;	author svnexp;	state Exp;
branches;
next	;

1.39.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.39.2.1.2.1
	1.39.2.1.4.1;
next	1.39.2.2;

1.39.2.2
date	2012.11.17.11.36.10;	author svnexp;	state Exp;
branches;
next	1.39.2.3;

1.39.2.3
date	2013.02.28.18.51.25;	author svnexp;	state Exp;
branches;
next	1.39.2.4;

1.39.2.4
date	2013.05.30.13.02.58;	author svnexp;	state Exp;
branches;
next	1.39.2.5;

1.39.2.5
date	2014.03.31.15.01.51;	author svnexp;	state Exp;
branches;
next	1.39.2.6;

1.39.2.6
date	2014.04.20.14.01.43;	author svnexp;	state Exp;
branches;
next	;

1.39.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.39.2.1.2.2;

1.39.2.1.2.2
date	2012.11.17.08.36.10;	author svnexp;	state Exp;
branches;
next	;

1.39.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.39.2.1.4.2;

1.39.2.1.4.2
date	2012.11.17.08.47.00;	author svnexp;	state Exp;
branches;
next	;

1.34.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.34.2.1.2.1;
next	1.34.2.2;

1.34.2.2
date	2010.04.21.06.33.10;	author des;	state Exp;
branches
	1.34.2.2.2.1
	1.34.2.2.4.1
	1.34.2.2.6.1;
next	1.34.2.3;

1.34.2.3
date	2012.11.17.10.35.55;	author svnexp;	state Exp;
branches;
next	1.34.2.4;

1.34.2.4
date	2013.03.01.02.23.12;	author svnexp;	state Exp;
branches;
next	;

1.34.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.34.2.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.34.2.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.34.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.34.2.2.6.2;

1.34.2.2.6.2
date	2012.11.17.08.24.37;	author svnexp;	state Exp;
branches;
next	;

1.32.2.1
date	2008.09.01.20.03.13;	author des;	state Exp;
branches
	1.32.2.1.2.1
	1.32.2.1.4.1
	1.32.2.1.6.1
	1.32.2.1.8.1;
next	1.32.2.2;

1.32.2.2
date	2012.11.17.08.01.14;	author svnexp;	state Exp;
branches;
next	;

1.32.2.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.32.2.1.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.32.2.1.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.32.2.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.32.2.1.8.2;

1.32.2.1.8.2
date	2012.11.17.08.16.36;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1
date	2005.09.11.16.50.35;	author des;	state Exp;
branches
	1.27.2.1.2.1
	1.27.2.1.4.1;
next	1.27.2.2;

1.27.2.2
date	2006.09.30.19.50.57;	author simon;	state Exp;
branches;
next	1.27.2.3;

1.27.2.3
date	2006.10.06.14.07.16;	author des;	state Exp;
branches;
next	1.27.2.4;

1.27.2.4
date	2006.11.11.00.51.28;	author des;	state Exp;
branches
	1.27.2.4.6.1;
next	1.27.2.5;

1.27.2.5
date	2012.11.17.07.39.00;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1.2.1
date	2006.09.30.19.53.20;	author simon;	state Exp;
branches;
next	;

1.27.2.1.4.1
date	2006.09.30.19.51.55;	author simon;	state Exp;
branches;
next	;

1.27.2.4.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.25.2.1
date	2006.03.01.14.19.48;	author simon;	state Exp;
branches
	1.25.2.1.2.1;
next	1.25.2.2;

1.25.2.2
date	2006.09.30.19.54.03;	author simon;	state Exp;
branches;
next	;

1.25.2.1.2.1
date	2006.09.30.19.54.57;	author simon;	state Exp;
branches;
next	;

1.25.4.1
date	2006.03.01.14.24.51;	author simon;	state Exp;
branches;
next	1.25.4.2;

1.25.4.2
date	2006.09.30.19.56.37;	author simon;	state Exp;
branches;
next	;

1.25.6.1
date	2006.03.01.14.21.01;	author simon;	state Exp;
branches;
next	1.25.6.2;

1.25.6.2
date	2006.09.30.19.55.52;	author simon;	state Exp;
branches;
next	;

1.21.2.1
date	2003.09.24.20.23.11;	author des;	state Exp;
branches;
next	;

1.2.2.1
date	2000.06.09.07.10.21;	author kris;	state Exp;
branches;
next	1.2.2.2;

1.2.2.2
date	2000.07.31.07.47.37;	author kris;	state Exp;
branches;
next	1.2.2.3;

1.2.2.3
date	2000.10.28.23.00.50;	author kris;	state Exp;
branches;
next	1.2.2.4;

1.2.2.4
date	2001.09.28.01.33.35;	author green;	state Exp;
branches
	1.2.2.4.4.1;
next	1.2.2.5;

1.2.2.5
date	2002.07.03.22.11.44;	author des;	state Exp;
branches;
next	1.2.2.6;

1.2.2.6
date	2002.07.25.16.03.44;	author fanf;	state Exp;
branches
	1.2.2.6.2.1;
next	1.2.2.7;

1.2.2.7
date	2003.02.03.17.31.08;	author des;	state Exp;
branches;
next	1.2.2.8;

1.2.2.8
date	2003.02.11.12.11.54;	author des;	state Exp;
branches
	1.2.2.8.2.1;
next	1.2.2.9;

1.2.2.9
date	2003.09.24.19.28.35;	author des;	state Exp;
branches
	1.2.2.9.6.1;
next	1.2.2.10;

1.2.2.10
date	2006.09.30.19.57.15;	author simon;	state Exp;
branches;
next	1.2.2.11;

1.2.2.11
date	2012.11.17.07.22.33;	author svnexp;	state Exp;
branches;
next	;

1.2.2.4.4.1
date	2002.07.16.12.33.09;	author des;	state Exp;
branches;
next	1.2.2.4.4.2;

1.2.2.4.4.2
date	2003.09.24.19.54.21;	author des;	state Exp;
branches;
next	;

1.2.2.6.2.1
date	2003.09.24.19.51.42;	author des;	state Exp;
branches;
next	;

1.2.2.8.2.1
date	2003.09.24.19.47.43;	author des;	state Exp;
branches;
next	;

1.2.2.9.6.1
date	2006.09.30.19.58.07;	author simon;	state Exp;
branches;
next	;

1.1.1.1
date	2000.02.24.14.29.46;	author markm;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2000.05.15.04.37.12;	author kris;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2000.09.10.08.26.31;	author kris;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2001.05.04.03.57.03;	author green;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2002.03.18.09.55.01;	author des;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2002.06.23.14.01.51;	author des;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2002.10.29.09.42.57;	author des;	state Exp;
branches;
next	1.1.1.8;

1.1.1.8
date	2004.01.07.11.10.10;	author des;	state Exp;
branches;
next	1.1.1.9;

1.1.1.9
date	2005.06.05.15.40.47;	author des;	state Exp;
branches;
next	1.1.1.10;

1.1.1.10
date	2006.03.22.19.46.09;	author des;	state Exp;
branches;
next	1.1.1.11;

1.1.1.11
date	2006.09.30.13.29.48;	author des;	state Exp;
branches;
next	;


desc
@@


1.44
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/250739
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#	$OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $
#	$FreeBSD: head/crypto/openssh/ssh_config 250739 2013-05-17 09:12:33Z des $

# This is the ssh client system-wide configuration file.  See
# ssh_config(5) for more information.  This file provides defaults for
# users, and the values can be changed in per-user configuration files
# or on the command line.

# Configuration data is parsed as follows:
#  1. command line options
#  2. user-specific file
#  3. system-wide file
# Any configuration value is only changed the first time it is set.
# Thus, host-specific definitions should be at the beginning of the
# configuration file, and defaults at the end.

# Site-wide defaults for some commonly used options.  For a comprehensive
# list of available options, their meanings and defaults, please see the
# ssh_config(5) man page.

# Host *
#   ForwardAgent no
#   ForwardX11 no
#   RhostsRSAAuthentication no
#   RSAAuthentication yes
#   PasswordAuthentication yes
#   HostbasedAuthentication no
#   GSSAPIAuthentication no
#   GSSAPIDelegateCredentials no
#   BatchMode no
#   CheckHostIP no
#   AddressFamily any
#   ConnectTimeout 0
#   StrictHostKeyChecking ask
#   IdentityFile ~/.ssh/identity
#   IdentityFile ~/.ssh/id_rsa
#   IdentityFile ~/.ssh/id_dsa
#   Port 22
#   Protocol 2,1
#   Cipher 3des
#   Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
#   MACs hmac-md5,hmac-sha1,umac-64@@openssh.com,hmac-ripemd160
#   EscapeChar ~
#   Tunnel no
#   TunnelDevice any:any
#   PermitLocalCommand no
#   VisualHostKey no
#   ProxyCommand ssh -q -W %h:%p gateway.example.com
#   VersionAddendum FreeBSD-20130515
@


1.43
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248619
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
#	$FreeBSD: head/crypto/openssh/ssh_config 248619 2013-03-22 17:55:38Z des $
d49 1
a49 1
#   VersionAddendum FreeBSD-20130322
@


1.43.2.1
log
@file ssh_config was added on branch RELENG_8_4 on 2013-03-28 13:02:26 +0000
@
text
@d1 49
@


1.43.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 49
#	$OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $
#	$FreeBSD: releng/8.4/crypto/openssh/ssh_config 247521 2013-03-01 02:06:04Z des $

# This is the ssh client system-wide configuration file.  See
# ssh_config(5) for more information.  This file provides defaults for
# users, and the values can be changed in per-user configuration files
# or on the command line.

# Configuration data is parsed as follows:
#  1. command line options
#  2. user-specific file
#  3. system-wide file
# Any configuration value is only changed the first time it is set.
# Thus, host-specific definitions should be at the beginning of the
# configuration file, and defaults at the end.

# Site-wide defaults for some commonly used options.  For a comprehensive
# list of available options, their meanings and defaults, please see the
# ssh_config(5) man page.

# Host *
#   ForwardAgent no
#   ForwardX11 no
#   RhostsRSAAuthentication no
#   RSAAuthentication yes
#   PasswordAuthentication yes
#   HostbasedAuthentication no
#   GSSAPIAuthentication no
#   GSSAPIDelegateCredentials no
#   BatchMode no
#   CheckHostIP no
#   AddressFamily any
#   ConnectTimeout 0
#   StrictHostKeyChecking ask
#   IdentityFile ~/.ssh/identity
#   IdentityFile ~/.ssh/id_rsa
#   IdentityFile ~/.ssh/id_dsa
#   Port 22
#   Protocol 2,1
#   Cipher 3des
#   Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
#   MACs hmac-md5,hmac-sha1,umac-64@@openssh.com,hmac-ripemd160
#   EscapeChar ~
#   Tunnel no
#   TunnelDevice any:any
#   PermitLocalCommand no
#   VisualHostKey no
#   ProxyCommand ssh -q -W %h:%p gateway.example.com
#   VersionAddendum FreeBSD-20120901
@


1.42
log
@Switching exporter and resync
@
text
@d2 1
a2 1
#	$FreeBSD: head/crypto/openssh/ssh_config 240075 2012-09-03 16:51:41Z des $
d49 1
a49 1
#   VersionAddendum FreeBSD-20120901
@


1.41
log
@SVN rev 240075 on 2012-09-03 16:51:41Z by des

Upgrade OpenSSH to 6.1p1.
@
text
@d2 1
a2 1
#	$FreeBSD$
@


1.40
log
@SVN rev 226046 on 2011-10-05 22:08:17Z by des

Upgrade to OpenSSH 5.9p1.

MFC after:	3 months
@
text
@d49 1
a49 1
#   VersionAddendum FreeBSD-20111001
@


1.39
log
@SVN rev 221420 on 2011-05-04 07:34:44Z by des

Upgrade to OpenSSH 5.8p2.
@
text
@d49 1
a49 1
#   VersionAddendum FreeBSD-20110503
@


1.39.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.39.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
#	$FreeBSD: stable/9/crypto/openssh/ssh_config 221420 2011-05-04 07:34:44Z des $
@


1.39.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247485
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
#	$FreeBSD: stable/9/crypto/openssh/ssh_config 247485 2013-02-28 18:43:50Z des $
d49 1
a49 1
#   VersionAddendum FreeBSD-20120901
@


1.39.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251135
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
#	$FreeBSD: stable/9/crypto/openssh/ssh_config 251135 2013-05-30 12:25:58Z des $
d49 1
a49 1
#   VersionAddendum FreeBSD-20130515
@


1.39.2.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/263970
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.28 2013/09/16 11:35:43 sthen Exp $
#	$FreeBSD: stable/9/crypto/openssh/ssh_config 263970 2014-03-31 14:39:56Z des $
d49 1
a49 2
#   RekeyLimit 1G 1h
#   VersionAddendum FreeBSD-20140324
@


1.39.2.6
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/264693
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
#	$FreeBSD: stable/9/crypto/openssh/ssh_config 264693 2014-04-20 13:12:32Z des $
d50 1
a50 1
#   VersionAddendum FreeBSD-20140420
@


1.39.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.39.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
#	$FreeBSD: releng/9.1/crypto/openssh/ssh_config 221420 2011-05-04 07:34:44Z des $
@


1.39.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.39.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
#	$FreeBSD: releng/9.0/crypto/openssh/ssh_config 221420 2011-05-04 07:34:44Z des $
@


1.38
log
@SVN rev 215116 on 2010-11-11 11:46:19Z by des

Upgrade to OpenSSH 5.6p1.
@
text
@d49 1
a49 1
#   VersionAddendum FreeBSD-20101111
@


1.37
log
@SVN rev 207319 on 2010-04-28 10:36:33Z by des

Upgrade to OpenSSH 5.5p1.
@
text
@d49 1
a49 1
#   VersionAddendum FreeBSD-20100428
@


1.36
log
@SVN rev 204917 on 2010-03-09 19:16:43Z by des

Upgrade to OpenSSH 5.4p1.

MFC after:	1 month
@
text
@d49 1
a49 1
#   VersionAddendum FreeBSD-20100308
@


1.35
log
@SVN rev 197679 on 2009-10-01 17:12:52Z by des

Upgrade to OpenSSH 5.3p1.
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $
d48 2
a49 1
#   VersionAddendum FreeBSD-20091001
@


1.34
log
@SVN rev 192595 on 2009-05-22 18:46:28Z by des

Upgrade to OpenSSH 5.2p1.

MFC after:	3 months
@
text
@d48 1
a48 1
#   VersionAddendum FreeBSD-20090522
@


1.34.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.34.2.2
log
@SVN rev 206984 on 2010-04-21 06:33:10Z by des

MFH OpenSSH 5.4p1
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $
d48 1
a48 2
#   ProxyCommand ssh -q -W %h:%p gateway.example.com
#   VersionAddendum FreeBSD-20100308
@


1.34.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
#	$FreeBSD: stable/8/crypto/openssh/ssh_config 206984 2010-04-21 06:33:10Z des $
@


1.34.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247521
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
#	$FreeBSD: stable/8/crypto/openssh/ssh_config 247521 2013-03-01 02:06:04Z des $
d49 1
a49 1
#   VersionAddendum FreeBSD-20120901
@


1.34.2.2.6.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.34.2.2.6.2
log
@Switch importer
@
text
@d2 1
a2 1
#	$FreeBSD: releng/8.3/crypto/openssh/ssh_config 206984 2010-04-21 06:33:10Z des $
@


1.34.2.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.34.2.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.34.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.33
log
@SVN rev 181111 on 2008-08-01 02:48:36Z by des

Upgrade to OpenSSH 5.1p1.

I have worked hard to reduce diffs against the vendor branch.  One
notable change in that respect is that we no longer prefer DSA over
RSA - the reasons for doing so went away years ago.  This may cause
some surprises, as ssh will warn about unknown host keys even for
hosts whose keys haven't changed.

MFC after:	6 weeks
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
d41 1
a41 1
#   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
d47 2
a48 1
#   VersionAddendum FreeBSD-20080801
@


1.32
log
@Resolve conflicts.
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.31 2006/09/30 13:39:07 des Exp $
d42 1
d47 1
a47 1
#   VersionAddendum FreeBSD-20061110
@


1.32.2.1
log
@SVN rev 182634 on 2008-09-01 20:03:13Z by des

MFH OpenSSH 5.1p1
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
#	$FreeBSD$
a41 1
#   MACs hmac-md5,hmac-sha1,umac-64@@openssh.com,hmac-ripemd160
d46 1
a46 1
#   VersionAddendum FreeBSD-20080901
@


1.32.2.2
log
@Switch importer
@
text
@d2 1
a2 1
#	$FreeBSD: stable/7/crypto/openssh/ssh_config 182634 2008-09-01 20:03:13Z des $
@


1.32.2.1.8.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.32.2.1.8.2
log
@Switch importer
@
text
@d2 1
a2 1
#	$FreeBSD: releng/7.4/crypto/openssh/ssh_config 182634 2008-09-01 20:03:13Z des $
@


1.32.2.1.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.32.2.1.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.32.2.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.31
log
@Bump version addendum.

MFC after:	1 week
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.30 2006/09/30 13:38:05 des Exp $
d46 1
a46 1
#   VersionAddendum FreeBSD-20060930
@


1.30
log
@Merge conflicts.

MFC after:	1 week
@
text
@d2 1
a2 1
#	$FreeBSD$
d46 1
a46 1
#   VersionAddendum FreeBSD-20060322
@


1.29
log
@Merge conflicts.
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.21 2005/12/06 22:38:27 reyk Exp $
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.28 2005/09/03 07:04:23 des Exp $
d28 2
@


1.28
log
@Resolve conflicts.
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $
#	$FreeBSD$
d41 4
a44 1
#   VersionAddendum FreeBSD-20050903
@


1.27
log
@Resolve conflicts.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.26 2004/10/28 16:11:28 des Exp $
d41 1
a41 1
#   VersionAddendum FreeBSD-20050605
@


1.27.2.1
log
@Upgrade to 4.2p1.

Approved by:	re (kensmith)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.27 2005/06/05 15:46:07 des Exp $
d41 1
a41 1
#   VersionAddendum FreeBSD-20050903
@


1.27.2.1.2.1
log
@Correct multiple vulnerabilities in OpenSSH.

Security:	FreeBSD-SA-06:22.openssh
Approved by:	so (simon)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.27.2.1 2005/09/11 16:50:35 des Exp $
d41 1
a41 1
#   VersionAddendum FreeBSD-20060930
@


1.27.2.1.4.1
log
@Correct multiple vulnerabilities in OpenSSH.

Security:	FreeBSD-SA-06:22.openssh
Approved by:	so (simon)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.27.2.1 2005/09/11 16:50:35 des Exp $
d41 1
a41 1
#   VersionAddendum FreeBSD-20060930
@


1.27.2.2
log
@Correct multiple vulnerabilities in OpenSSH.

Security:	FreeBSD-SA-06:22.openssh
Approved by:	re (kensmith)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.27.2.1 2005/09/11 16:50:35 des Exp $
d41 1
a41 1
#   VersionAddendum FreeBSD-20060930
@


1.27.2.3
log
@MFC: OpenSSH 4.4p1.

Approved by:	re (kensmith)
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.31 2006/09/30 13:39:07 des Exp $
a27 2
#   GSSAPIAuthentication no
#   GSSAPIDelegateCredentials no
a40 3
#   Tunnel no
#   TunnelDevice any:any
#   PermitLocalCommand no
@


1.27.2.4
log
@InstaMFC: OpenSSH 4.5p1

Approved by:	re (kensmith)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.27.2.3 2006/10/06 14:07:16 des Exp $
d46 1
a46 1
#   VersionAddendum FreeBSD-20061110
@


1.27.2.5
log
@Switch importer
@
text
@d2 1
a2 1
#	$FreeBSD: stable/6/crypto/openssh/ssh_config 164158 2006-11-11 00:51:29Z des $
@


1.27.2.4.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@d2 1
a2 1
#	$FreeBSD$
@


1.26
log
@Resolve conflicts
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.19 2003/08/13 08:46:31 markus Exp $
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.25 2004/04/20 09:37:28 des Exp $
d17 3
a19 1
# Site-wide defaults for various options
d41 1
a41 1
#   VersionAddendum FreeBSD-20041028
@


1.25
log
@Adjust version number and addendum.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.24 2004/02/26 11:54:03 des Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20040419
@


1.25.4.1
log
@Correct a remote DoS in OpenSSH when using PAM and privilege
separation. [06:09]

Submitted by:	des

Correct a remote kernel panic when processing zero-length RPC records
via TCP. [06:10]

Security:	FreeBSD-SA-06:09.openssh
Security:	FreeBSD-SA-06:10.nfs
Approved by:	so (cperciva)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.25 2004/04/20 09:37:28 des Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20060123
@


1.25.4.2
log
@Correct multiple vulnerabilities in OpenSSH.

Security:	FreeBSD-SA-06:22.openssh
Approved by:	so (simon)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.25.4.1 2006/03/01 14:24:51 simon Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20060930
@


1.25.6.1
log
@Correct a remote DoS in OpenSSH when using PAM and privilege
separation. [06:09]

Submitted by:	des

Correct a remote kernel panic when processing zero-length RPC records
via TCP. [06:10]

Security:	FreeBSD-SA-06:09.openssh
Security:	FreeBSD-SA-06:10.nfs
Approved by:	so (cperciva)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.25 2004/04/20 09:37:28 des Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20060123
@


1.25.6.2
log
@Correct multiple vulnerabilities in OpenSSH.

Security:	FreeBSD-SA-06:22.openssh
Approved by:	so (simon)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.25.6.1 2006/03/01 14:21:01 simon Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20060930
@


1.25.2.1
log
@Correct a remote DoS in OpenSSH when using PAM and privilege
separation. [06:09]

Submitted by:	des

Correct a remote kernel panic when processing zero-length RPC records
via TCP. [06:10]

Security:	FreeBSD-SA-06:09.openssh
Security:	FreeBSD-SA-06:10.nfs
Approved by:	re (scottl)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.25 2004/04/20 09:37:28 des Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20060123
@


1.25.2.1.2.1
log
@Correct multiple vulnerabilities in OpenSSH.

Security:	FreeBSD-SA-06:22.openssh
Approved by:	so (simon)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.25.2.1 2006/03/01 14:19:48 simon Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20060930
@


1.25.2.2
log
@Correct multiple vulnerabilities in OpenSSH.

Security:	FreeBSD-SA-06:22.openssh
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.25.2.1 2006/03/01 14:19:48 simon Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20060930
@


1.24
log
@Update VersionAddendum in config files and man pages.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.23 2004/01/07 11:16:24 des Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20040226
@


1.23
log
@Resolve conflicts and remove obsolete files.

Sponsored by:	registrar.no
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.22 2003/09/24 19:20:23 des Exp $
d39 1
a39 1
#   VersionAddendum FreeBSD-20040106
@


1.22
log
@Update version string.
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.21 2003/04/23 17:10:53 des Exp $
a21 1
#   RhostsAuthentication no
d28 2
d39 1
a39 1
#   VersionAddendum FreeBSD-20030924
@


1.21
log
@Resolve conflicts.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.20 2003/02/11 12:11:15 des Exp $
d38 1
a38 1
#   VersionAddendum FreeBSD-20030423
@


1.21.2.1
log
@Update version string.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.21 2003/04/23 17:10:53 des Exp $
d38 1
a38 1
#   VersionAddendum FreeBSD-20030924
@


1.20
log
@document the current default value for VersionAddendum.
@
text
@d2 1
a2 1
#	$FreeBSD$
d38 1
a38 1
#   VersionAddendum FreeBSD-20030201
@


1.19
log
@Document the current default value for VersionAddendum.
@
text
@d38 1
a38 1
#   VersionAddendum FreeBSD-20021029
@


1.18
log
@Resolve conflicts.
@
text
@d38 1
a38 1
#   VersionAddendum FreeBSD-20020629
@


1.17
log
@Document the FreeBSD default for CheckHostIP, which was changed in
rev 1.2 of readconf.c.

Approved by:	des
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.15 2002/06/20 20:03:34 stevesk Exp $
d26 1
@


1.16
log
@Forgot to update the addendum in the config files.
@
text
@d27 1
a27 1
#   CheckHostIP yes
@


1.15
log
@Document FreeBSD defaults.

Sponsored by:	DARPA, NAI Labs
@
text
@d37 1
a37 1
#   VersionAddendum FreeBSD-20020625
@


1.14
log
@Forcibly revert to mainline.
@
text
@d2 1
d37 1
@


1.13
log
@Resolve conflicts.  Known issues:

 - sshd fails to set TERM correctly.
 - privilege separation may break PAM and is currently turned off.
 - man pages have not yet been updated

I will have these issues resolved, and privilege separation turned on by
default, in time for DP2.

Sponsored by:	DARPA, NAI Labs
@
text
@a1 1
#	$FreeBSD$
a35 1
#   VersionAddendum FreeBSD-20020402
@


1.12
log
@Usual after-import fixup of SCM IDs.
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.12 2002/01/16 17:55:33 stevesk Exp $
# $FreeBSD$
d4 4
a7 4
# This is the ssh client system-wide configuration file.  See ssh(1)
# for more information.  This file provides defaults for users, and
# the values can be changed in per-user configuration files or on the
# command line.
d22 2
a23 2
#   RhostsAuthentication yes
#   RhostsRSAAuthentication yes
a25 2
#   FallBackToRsh no
#   UseRsh no
@


1.11
log
@Change the FreeBSD version addendum to "FreeBSD-20020402".  This shortens
the version string to 28 characters, which is below the 40-character limit
specified in the proposed SECSH standard.  Some servers, however (like the
one built into the Foundry BigIron line of switches) will hang when
confronted with a version string longer than 24 characters, so some users
may need to shorten it further.

Sponsored by:	DARPA, NAI Labs
@
text
@d2 1
a2 1
#	$FreeBSD$
@


1.10
log
@Fix conflicts.
@
text
@d39 1
@


1.9
log
@Fix $FreeBSD$ style committer messed up in rev 1.7 for some reason.
@
text
@d1 2
a2 6
# This is ssh client systemwide configuration file.  This file provides 
# defaults for users, and the values can be changed in per-user configuration
# files or on the command line.
#
#	$OpenBSD: ssh_config,v 1.10 2001/04/03 21:19:38 todd Exp $
# $FreeBSD: src/crypto/openssh/ssh_config,v 1.8 2001/05/04 04:14:23 green Exp $
d4 4
a7 3
# This is ssh client systemwide configuration file.  See ssh(1) for more
# information.  This file provides defaults for users, and the values can
# be changed in per-user configuration files or on the command line.
d22 1
a22 1
#   RhostsAuthentication no
d30 1
a30 1
#   StrictHostKeyChecking yes
d32 1
a33 1
#   IdentityFile ~/.ssh/id_rsa
d36 2
a37 1
#   Cipher blowfish
@


1.8
log
@Fix conflicts for OpenSSH 2.9.
@
text
@d6 1
a6 1
#	$FreeBSD$
@


1.7
log
@Update to OpenSSH 2.3.0 with FreeBSD modifications.  OpenSSH 2.3.0
new features description elided in favor of checking out their
website.

Important new FreeBSD-version stuff: PAM support has been worked
in, partially from the "Unix" OpenSSH version, and a lot due to the
work of Eivind Eklend, too.

This requires at least the following in pam.conf:

sshd    auth    sufficient      pam_skey.so
sshd    auth    required        pam_unix.so                     try_first_pass
sshd    session required        pam_permit.so

Parts by:	Eivind Eklend <eivind@@FreeBSD.org>
@
text
@d5 6
a10 1
# $FreeBSD$
d23 3
a25 3
#   ForwardAgent yes
#   ForwardX11 yes
#   RhostsAuthentication yes
d33 1
a33 1
#   StrictHostKeyChecking no
d35 2
@


1.6
log
@Resolve conflicts and update for OpenSSH 2.2.0

Reviewed by:	gshapiro, peter, green
@
text
@@


1.5
log
@Forced commit.  This is to try and help folks that used the international
crypto repo and have slightly different files but with the same version.
cvsup in 'checkout mode' has no trouble with this, but cvs can get really
silly about it.
@
text
@d5 1
a5 1
# $FreeBSD: src/crypto/openssh/ssh_config,v 1.4 2000/07/11 09:39:34 peter Exp $
@


1.4
log
@Make FallBackToRsh off by default.  Falling back to rsh by default is
silly in this day and age.

Approved by: kris
@
text
@d5 1
a5 1
# $FreeBSD: src/crypto/openssh/ssh_config,v 1.3 2000/05/15 05:24:25 kris Exp $
@


1.3
log
@Resolve conflicts and update for FreeBSD.
@
text
@d5 1
a5 1
# $FreeBSD$
d24 1
a24 1
#   FallBackToRsh yes
@


1.2
log
@Add the patches fom ports (QV: ports/security/openssh/patches/patch-*)
@
text
@d31 1
@


1.2.2.1
log
@MFC: OpenSSH 2.1.0 snapshot
@
text
@d5 1
a5 1
# $FreeBSD: src/crypto/openssh/ssh_config,v 1.3 2000/05/15 05:24:25 kris Exp $
a30 1
#   Protocol 2,1
@


1.2.2.2
log
@MFC: Default to "FallBackToRsh no" and sync internal defaults and
documentation to the default config files.
@
text
@d5 1
a5 1
# $FreeBSD$
d24 1
a24 1
#   FallBackToRsh no
@


1.2.2.3
log
@MFC: OpenSSH 2.2.0
@
text
@d5 1
a5 1
# $FreeBSD: src/crypto/openssh/ssh_config,v 1.6 2000/09/10 09:35:38 kris Exp $
@


1.2.2.4
log
@MFC: OpenSSH 2.9

The only difference between this and what's in -CURRENT is that the
default /etc/ssh/ssh_config sets "Protocol 1,2" for all hosts.  This can
be overrided entirely in user ~/.ssh/config files, as always.
@
text
@d5 1
a5 6
#	$OpenBSD: ssh_config,v 1.10 2001/04/03 21:19:38 todd Exp $
# $FreeBSD$

# This is ssh client systemwide configuration file.  See ssh(1) for more
# information.  This file provides defaults for users, and the values can
# be changed in per-user configuration files or on the command line.
d17 4
a20 4
Host *
#   ForwardAgent no
#   ForwardX11 no
#   RhostsAuthentication no
d28 1
a28 1
#   StrictHostKeyChecking yes
a29 2
#   IdentityFile ~/.ssh/id_dsa
#   IdentityFile ~/.ssh/id_rsa
d31 1
a31 1
  Protocol 1,2
@


1.2.2.4.4.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@d1 6
a6 2
#	$OpenBSD: ssh_config,v 1.15 2002/06/20 20:03:34 stevesk Exp $
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.2.2.5 2002/07/03 22:11:44 des Exp $
d8 3
a10 4
# This is the ssh client system-wide configuration file.  See
# ssh_config(5) for more information.  This file provides defaults for
# users, and the values can be changed in per-user configuration files
# or on the command line.
d26 1
a26 1
#   RhostsRSAAuthentication no
d29 2
d33 1
a33 1
#   StrictHostKeyChecking ask
d35 1
a36 1
#   IdentityFile ~/.ssh/id_dsa
d39 1
a39 2
#   Cipher 3des
#   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
a40 1
#   VersionAddendum FreeBSD-20020629
@


1.2.2.4.4.2
log
@Update version string.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.2.2.4.4.1 2002/07/16 12:33:09 des Exp $
d37 1
a37 1
#   VersionAddendum FreeBSD-20030924
@


1.2.2.5
log
@Synch up to OpenSSH 3.4p1 - very nearly the same sources as in -CURRENT,
with a slightly different config.h to account for differences between
-CURRENT and -STABLE.

Privilege separation defaults to off for now as it breaks some aspects
of Kerberos authentication.

Sponsored by:	DARPA, NAI Labs
@
text
@d1 6
a6 2
#	$OpenBSD: ssh_config,v 1.15 2002/06/20 20:03:34 stevesk Exp $
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.16 2002/06/30 10:32:09 des Exp $
d8 3
a10 4
# This is the ssh client system-wide configuration file.  See
# ssh_config(5) for more information.  This file provides defaults for
# users, and the values can be changed in per-user configuration files
# or on the command line.
d22 1
a22 1
# Host *
d26 1
a26 1
#   RhostsRSAAuthentication no
d29 2
d33 1
a33 1
#   StrictHostKeyChecking ask
d35 1
a36 1
#   IdentityFile ~/.ssh/id_dsa
d38 2
a39 3
#   Protocol 2,1
#   Cipher 3des
#   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
a40 1
#   VersionAddendum FreeBSD-20020629
@


1.2.2.6
log
@MFC:
  Document the FreeBSD default for CheckHostIP, which was changed in
  rev 1.2 of readconf.c.

  Revision  Changes    Path
  1.17      +1 -1      src/crypto/openssh/ssh_config
  1.5       +1 -1      src/crypto/openssh/ssh_config.5
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.2.2.5 2002/07/03 22:11:44 des Exp $
d27 1
a27 1
#   CheckHostIP no
@


1.2.2.6.2.1
log
@Update version string.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.2.2.6 2002/07/25 16:03:44 fanf Exp $
d37 1
a37 1
#   VersionAddendum FreeBSD-20030924
@


1.2.2.7
log
@MFC: OpenSSH 3.5p1, with all FreeBSD patches.
@
text
@d1 2
a2 2
#	$OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $
#	$FreeBSD$
a25 1
#   HostbasedAuthentication no
d37 1
a37 1
#   VersionAddendum FreeBSD-20021029
@


1.2.2.8
log
@InstaMFC: document the correct VersionAddendum.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.2.2.7 2003/02/03 17:31:08 des Exp $
d38 1
a38 1
#   VersionAddendum FreeBSD-20030201
@


1.2.2.8.2.1
log
@Update version string.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.2.2.8 2003/02/11 12:11:54 des Exp $
d38 1
a38 1
#   VersionAddendum FreeBSD-20030924
@


1.2.2.9
log
@Update version string.
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.2.2.8 2003/02/11 12:11:54 des Exp $
d38 1
a38 1
#   VersionAddendum FreeBSD-20030924
@


1.2.2.9.6.1
log
@Correct multiple vulnerabilities in OpenSSH.

Security:	FreeBSD-SA-06:22.openssh
Approved by:	so (simon)
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.2.2.9 2003/09/24 19:28:35 des Exp $
d38 1
a38 1
#   VersionAddendum FreeBSD-20060930
@


1.2.2.10
log
@Correct multiple vulnerabilities in OpenSSH.

Security:	FreeBSD-SA-06:22.openssh
@
text
@d2 1
a2 1
#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.2.2.9 2003/09/24 19:28:35 des Exp $
d38 1
a38 1
#   VersionAddendum FreeBSD-20060930
@


1.2.2.11
log
@Switch importer
@
text
@d2 1
a2 1
#	$FreeBSD: stable/4/crypto/openssh/ssh_config 162895 2006-09-30 19:57:15Z simon $
@


1.1
log
@Initial revision
@
text
@d4 2
@


1.1.1.1
log
@Vendor import of OpenSSH.
@
text
@@


1.1.1.2
log
@Initial import of OpenSSH v2.1.
@
text
@a28 1
#   Protocol 2,1
@


1.1.1.3
log
@Initial import of OpenSSH post-2.2.0 snapshot dated 2000-09-09
@
text
@d22 1
a22 1
#   FallBackToRsh no
@


1.1.1.4
log
@Say "hi" to the latest in the OpenSSH series, version 2.9!

Happy birthday to:	rwatson
@
text
@d1 3
a3 5
#	$OpenBSD: ssh_config,v 1.10 2001/04/03 21:19:38 todd Exp $

# This is ssh client systemwide configuration file.  See ssh(1) for more
# information.  This file provides defaults for users, and the values can
# be changed in per-user configuration files or on the command line.
d16 3
a18 3
#   ForwardAgent no
#   ForwardX11 no
#   RhostsAuthentication no
d26 1
a26 1
#   StrictHostKeyChecking yes
a27 2
#   IdentityFile ~/.ssh/id_dsa
#   IdentityFile ~/.ssh/id_rsa
@


1.1.1.5
log
@Vendor import of OpenSSH 3.1
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.12 2002/01/16 17:55:33 stevesk Exp $
d3 3
a5 4
# This is the ssh client system-wide configuration file.  See ssh(1)
# for more information.  This file provides defaults for users, and
# the values can be changed in per-user configuration files or on the
# command line.
d20 1
a20 1
#   RhostsAuthentication yes
d28 1
a28 1
#   StrictHostKeyChecking ask
d30 1
a31 1
#   IdentityFile ~/.ssh/id_dsa
d34 1
a34 2
#   Cipher 3des
#   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
@


1.1.1.6
log
@Vendor import of OpenSSH 3.3.
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.15 2002/06/20 20:03:34 stevesk Exp $
d3 4
a6 4
# This is the ssh client system-wide configuration file.  See
# ssh_config(5) for more information.  This file provides defaults for
# users, and the values can be changed in per-user configuration files
# or on the command line.
d21 2
a22 2
#   RhostsAuthentication no
#   RhostsRSAAuthentication no
d25 2
@


1.1.1.7
log
@Vendor import of OpenSSH-portable 3.5p1.
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $
a24 1
#   HostbasedAuthentication no
@


1.1.1.8
log
@Vendor import of OpenSSH 3.7.1p2.
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.19 2003/08/13 08:46:31 markus Exp $
d21 1
a27 2
#   AddressFamily any
#   ConnectTimeout 0
@


1.1.1.9
log
@Vendor import of OpenSSH 4.0p1.
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $
d16 1
a16 3
# Site-wide defaults for some commonly used options.  For a comprehensive
# list of available options, their meanings and defaults, please see the
# ssh_config(5) man page.
@


1.1.1.10
log
@Vendor import of OpenSSH 4.3p1.
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.21 2005/12/06 22:38:27 reyk Exp $
a39 3
#   Tunnel no
#   TunnelDevice any:any
#   PermitLocalCommand no
@


1.1.1.11
log
@Vendor import of OpenSSH 4.4p1.
@
text
@d1 1
a1 1
#	$OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
a26 2
#   GSSAPIAuthentication no
#   GSSAPIDelegateCredentials no
@


