summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh_config.524
2 files changed, 15 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index ae0f84777..2eaa2a857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,9 @@
37 [ssh_config.5 readconf.h readconf.c] 37 [ssh_config.5 readconf.h readconf.c]
38 add the ability to ignore specific unrecognised ssh_config options; 38 add the ability to ignore specific unrecognised ssh_config options;
39 bz#866; ok markus@ 39 bz#866; ok markus@
40 - jmc@cvs.openbsd.org 2013/05/16 06:28:45
41 [ssh_config.5]
42 put IgnoreUnknown in the right place;
40 43
4120130510 4420130510
42 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler 45 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler
diff --git a/ssh_config.5 b/ssh_config.5
index 955afe351..003ed68ff 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.163 2013/05/16 04:27:50 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.164 2013/05/16 06:28:45 jmc Exp $
37.Dd $Mdocdate: May 16 2013 $ 37.Dd $Mdocdate: May 16 2013 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
@@ -597,17 +597,6 @@ The default is the name given on the command line.
597Numeric IP addresses are also permitted (both on the command line and in 597Numeric IP addresses are also permitted (both on the command line and in
598.Cm HostName 598.Cm HostName
599specifications). 599specifications).
600.It Cm IgnoreUnknown
601Specifies a pattern-list of unknown options to be ignored if they are
602encountered in configuration parsing.
603This may be used to suppress errors if
604.Nm
605contains options that are unrecognised by
606.Xr ssh 1 .
607It is recommended that
608.Cm IgnoreUnknown
609be listed early in the configuration file as it will not be applied
610to unknown options that appear before it.
611.It Cm IdentitiesOnly 600.It Cm IdentitiesOnly
612Specifies that 601Specifies that
613.Xr ssh 1 602.Xr ssh 1
@@ -668,6 +657,17 @@ Multiple
668.Cm IdentityFile 657.Cm IdentityFile
669directives will add to the list of identities tried (this behaviour 658directives will add to the list of identities tried (this behaviour
670differs from that of other configuration directives). 659differs from that of other configuration directives).
660.It Cm IgnoreUnknown
661Specifies a pattern-list of unknown options to be ignored if they are
662encountered in configuration parsing.
663This may be used to suppress errors if
664.Nm
665contains options that are unrecognised by
666.Xr ssh 1 .
667It is recommended that
668.Cm IgnoreUnknown
669be listed early in the configuration file as it will not be applied
670to unknown options that appear before it.
671.It Cm IPQoS 671.It Cm IPQoS
672Specifies the IPv4 type-of-service or DSCP class for connections. 672Specifies the IPv4 type-of-service or DSCP class for connections.
673Accepted values are 673Accepted values are