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.525
5 files changed, 51 insertions, 3 deletions
diff --git a/readconf.c b/readconf.c
index 273552d7c..6ac8beae0 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1618,7 +1618,7 @@ fill_default_options(Options * options)
1618 if (options->forward_x11 == -1) 1618 if (options->forward_x11 == -1)
1619 options->forward_x11 = 0; 1619 options->forward_x11 = 0;
1620 if (options->forward_x11_trusted == -1) 1620 if (options->forward_x11_trusted == -1)
1621 options->forward_x11_trusted = 0; 1621 options->forward_x11_trusted = 1;
1622 if (options->forward_x11_timeout == -1) 1622 if (options->forward_x11_timeout == -1)
1623 options->forward_x11_timeout = 1200; 1623 options->forward_x11_timeout = 1200;
1624 if (options->exit_on_forward_failure == -1) 1624 if (options->exit_on_forward_failure == -1)
diff --git a/ssh_config b/ssh_config
index 228e5abce..c9386aadd 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 85f306cfd..cc91a5c56 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
@@ -648,7 +664,8 @@ token used for the session will be set to expire after 20 minutes.
648Remote clients will be refused access after this time. 664Remote clients will be refused access after this time.
649.Pp 665.Pp
650The default is 666The default is
651.Dq no . 667.Dq yes
668(Debian-specific).
652.Pp 669.Pp
653See the X11 SECURITY extension specification for full details on 670See the X11 SECURITY extension specification for full details on
654the restrictions imposed on untrusted clients. 671the restrictions imposed on untrusted clients.
diff --git a/sshd_config b/sshd_config
index d9b859407..4db32f509 100644
--- a/sshd_config
+++ b/sshd_config
@@ -41,6 +41,7 @@
41# Authentication: 41# Authentication:
42 42
43#LoginGraceTime 2m 43#LoginGraceTime 2m
44# See /usr/share/doc/openssh-server/README.Debian.gz.
44#PermitRootLogin yes 45#PermitRootLogin yes
45#StrictModes yes 46#StrictModes yes
46#MaxAuthTries 6 47#MaxAuthTries 6
diff --git a/sshd_config.5 b/sshd_config.5
index 9fa608698..496530bf5 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -57,6 +57,31 @@ 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 ChallengeResponseAuthentication No no
73.It
74.Cm X11Forwarding No yes
75.It
76.Cm PrintMotd No no
77.It
78.Cm AcceptEnv No LANG LC_*
79.It
80.Cm Subsystem No sftp /usr/lib/openssh/sftp-server
81.It
82.Cm UsePAM No yes
83.El
84.Pp
60The possible 85The possible
61keywords and their meanings are as follows (note that 86keywords and their meanings are as follows (note that
62keywords are case-insensitive and arguments are case-sensitive): 87keywords are case-insensitive and arguments are case-sensitive):