summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--readconf.c2
-rw-r--r--ssh_config7
-rw-r--r--ssh_config.519
-rw-r--r--sshd_config1
-rw-r--r--sshd_config.527
5 files changed, 53 insertions, 3 deletions
diff --git a/readconf.c b/readconf.c
index 389de7d60..2778176c6 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1298,7 +1298,7 @@ fill_default_options(Options * options)
1298 if (options->forward_x11 == -1) 1298 if (options->forward_x11 == -1)
1299 options->forward_x11 = 0; 1299 options->forward_x11 = 0;
1300 if (options->forward_x11_trusted == -1) 1300 if (options->forward_x11_trusted == -1)
1301 options->forward_x11_trusted = 0; 1301 options->forward_x11_trusted = 1;
1302 if (options->forward_x11_timeout == -1) 1302 if (options->forward_x11_timeout == -1)
1303 options->forward_x11_timeout = 1200; 1303 options->forward_x11_timeout = 1200;
1304 if (options->exit_on_forward_failure == -1) 1304 if (options->exit_on_forward_failure == -1)
diff --git a/ssh_config b/ssh_config
index 32343213f..064b59359 100644
--- a/ssh_config
+++ b/ssh_config
@@ -17,9 +17,10 @@
17# list of available options, their meanings and defaults, please see the 17# list of available options, their meanings and defaults, please see the
18# ssh_config(5) man page. 18# ssh_config(5) man page.
19 19
20# Host * 20Host *
21# ForwardAgent no 21# ForwardAgent no
22# ForwardX11 no 22# ForwardX11 no
23# ForwardX11Trusted yes
23# RhostsRSAAuthentication no 24# RhostsRSAAuthentication no
24# RSAAuthentication yes 25# RSAAuthentication yes
25# PasswordAuthentication yes 26# PasswordAuthentication yes
@@ -48,3 +49,7 @@
48# VisualHostKey no 49# VisualHostKey no
49# ProxyCommand ssh -q -W %h:%p gateway.example.com 50# ProxyCommand ssh -q -W %h:%p gateway.example.com
50# RekeyLimit 1G 1h 51# RekeyLimit 1G 1h
52 SendEnv LANG LC_*
53 HashKnownHosts yes
54 GSSAPIAuthentication yes
55 GSSAPIDelegateCredentials no
diff --git a/ssh_config.5 b/ssh_config.5
index 5bca9321b..127540a60 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more
71host-specific declarations should be given near the beginning of the 71host-specific declarations should be given near the beginning of the
72file, and general defaults at the end. 72file, and general defaults at the end.
73.Pp 73.Pp
74Note that the Debian
75.Ic openssh-client
76package sets several options as standard in
77.Pa /etc/ssh/ssh_config
78which are not the default in
79.Xr ssh 1 :
80.Pp
81.Bl -bullet -offset indent -compact
82.It
83.Cm SendEnv No LANG LC_*
84.It
85.Cm HashKnownHosts No yes
86.It
87.Cm GSSAPIAuthentication No yes
88.El
89.Pp
74The configuration file has the following format: 90The configuration file has the following format:
75.Pp 91.Pp
76Empty lines and lines starting with 92Empty lines and lines starting with
@@ -501,7 +517,8 @@ token used for the session will be set to expire after 20 minutes.
501Remote clients will be refused access after this time. 517Remote clients will be refused access after this time.
502.Pp 518.Pp
503The default is 519The default is
504.Dq no . 520.Dq yes
521(Debian-specific).
505.Pp 522.Pp
506See the X11 SECURITY extension specification for full details on 523See the X11 SECURITY extension specification for full details on
507the restrictions imposed on untrusted clients. 524the restrictions imposed on untrusted clients.
diff --git a/sshd_config b/sshd_config
index 945014124..9cfe28d03 100644
--- a/sshd_config
+++ b/sshd_config
@@ -40,6 +40,7 @@
40# Authentication: 40# Authentication:
41 41
42#LoginGraceTime 2m 42#LoginGraceTime 2m
43# See /usr/share/doc/openssh-server/README.Debian.gz.
43#PermitRootLogin yes 44#PermitRootLogin yes
44#StrictModes yes 45#StrictModes yes
45#MaxAuthTries 6 46#MaxAuthTries 6
diff --git a/sshd_config.5 b/sshd_config.5
index ec4851ac4..faf93fc90 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -57,6 +57,33 @@ Arguments may optionally be enclosed in double quotes
57.Pq \&" 57.Pq \&"
58in order to represent arguments containing spaces. 58in order to represent arguments containing spaces.
59.Pp 59.Pp
60Note that the Debian
61.Ic openssh-server
62package sets several options as standard in
63.Pa /etc/ssh/sshd_config
64which are not the default in
65.Xr sshd 8 .
66The exact list depends on whether the package was installed fresh or
67upgraded from various possible previous versions, but includes at least the
68following:
69.Pp
70.Bl -bullet -offset indent -compact
71.It
72.Cm Protocol No 2
73.It
74.Cm ChallengeResponseAuthentication No no
75.It
76.Cm X11Forwarding No yes
77.It
78.Cm PrintMotd No no
79.It
80.Cm AcceptEnv No LANG LC_*
81.It
82.Cm Subsystem No sftp /usr/lib/openssh/sftp-server
83.It
84.Cm UsePAM No yes
85.El
86.Pp
60The possible 87The possible
61keywords and their meanings are as follows (note that 88keywords and their meanings are as follows (note that
62keywords are case-insensitive and arguments are case-sensitive): 89keywords are case-insensitive and arguments are case-sensitive):