summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--sshd_config8
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 54b3ac85e..399f74084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
28 - (bal) removed news4-posix.h (now empty) 28 - (bal) removed news4-posix.h (now empty)
29 - (bal) changed bsd-bindresvport.c and bsd-rresvport.c to use 'socklen_t' 29 - (bal) changed bsd-bindresvport.c and bsd-rresvport.c to use 'socklen_t'
30 instead of 'int' 30 instead of 'int'
31 - (stevesk) sshd_config: sync
31 32
3220010108 3320010108
33 - (bal) Fixed another typo in cli.c 34 - (bal) Fixed another typo in cli.c
diff --git a/sshd_config b/sshd_config
index 26372ab16..ad8db2746 100644
--- a/sshd_config
+++ b/sshd_config
@@ -2,11 +2,11 @@
2 2
3Port 22 3Port 22
4#Protocol 2,1 4#Protocol 2,1
5ListenAddress 0.0.0.0 5#ListenAddress 0.0.0.0
6#ListenAddress :: 6#ListenAddress ::
7HostKey /etc/ssh_host_key 7HostKey /etc/ssh_host_key
8HostKey /etc/ssh_host_rsa_key
9HostKey /etc/ssh_host_dsa_key 8HostKey /etc/ssh_host_dsa_key
9#HostKey /etc/ssh_host_rsa_key
10ServerKeyBits 768 10ServerKeyBits 768
11LoginGraceTime 600 11LoginGraceTime 600
12KeyRegenerationInterval 3600 12KeyRegenerationInterval 3600
@@ -23,7 +23,7 @@ PrintMotd yes
23KeepAlive yes 23KeepAlive yes
24 24
25# Logging 25# Logging
26SyslogFacility AUTHPRIV 26SyslogFacility AUTH
27LogLevel INFO 27LogLevel INFO
28#obsoletes QuietMode and FascistLogging 28#obsoletes QuietMode and FascistLogging
29 29
@@ -50,7 +50,7 @@ PermitEmptyPasswords no
50# Kerberos TGT Passing does only work with the AFS kaserver 50# Kerberos TGT Passing does only work with the AFS kaserver
51#KerberosTgtPassing yes 51#KerberosTgtPassing yes
52 52
53CheckMail no 53#CheckMail yes
54#UseLogin no 54#UseLogin no
55 55
56# Uncomment if you want to enable sftp 56# Uncomment if you want to enable sftp