components/openssh/patches/040-default_config_files.patch
changeset 6930 31ef2580c45d
parent 5820 cef0da89f9ee
child 7649 69d7508f0d66
equal deleted inserted replaced
6929:e7955ccacd45 6930:31ef2580c45d
    28 +SendEnv LANG
    28 +SendEnv LANG
    29 +SendEnv LC_*
    29 +SendEnv LC_*
    30 diff -pur old/sshd_config new/sshd_config
    30 diff -pur old/sshd_config new/sshd_config
    31 --- old/sshd_config
    31 --- old/sshd_config
    32 +++ new/sshd_config
    32 +++ new/sshd_config
    33 @@ -1,133 +1,96 @@
    33 @@ -1,132 +1,96 @@
    34 -#	$OpenBSD: sshd_config,v 1.98 2016/02/17 05:29:04 djm Exp $
    34 -#	$OpenBSD: sshd_config,v 1.99 2016/07/11 03:19:44 tedu Exp $
    35 +#	$OpenBSD: sshd_config,v 1.97 2015/08/06 14:53:21 deraadt Exp $
    35 +#       $OpenBSD: sshd_config,v 1.99 2016/07/11 03:19:44 tedu Exp $
    36  
    36  
    37  # This is the sshd server system-wide configuration file.  See
    37  # This is the sshd server system-wide configuration file.  See
    38  # sshd_config(5) for more information.
    38  # sshd_config(5) for more information.
    39 +#
    39 +#
    40  
    40  
    77 -
    77 -
    78 -# Ciphers and keying
    78 -# Ciphers and keying
    79 -#RekeyLimit default none
    79 -#RekeyLimit default none
    80 -
    80 -
    81 -# Logging
    81 -# Logging
    82 -# obsoletes QuietMode and FascistLogging
       
    83 -#SyslogFacility AUTH
    82 -#SyslogFacility AUTH
    84 -#LogLevel INFO
    83 -#LogLevel INFO
    85 +# X11 tunneling options
    84 +# X11 tunneling options
    86 +#X11DisplayOffset 10
    85 +#X11DisplayOffset 10
    87 +#X11UseLocalhost yes
    86 +#X11UseLocalhost yes