diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sshd_config | 8 |
2 files changed, 11 insertions, 5 deletions
@@ -77,6 +77,12 @@ | |||
77 | [sshconnect.c] | 77 | [sshconnect.c] |
78 | don't connect if batch_mode is true and stricthostkeychecking set to | 78 | don't connect if batch_mode is true and stricthostkeychecking set to |
79 | 'ask' | 79 | 'ask' |
80 | - djm@cvs.openbsd.org 2001/02/04 21:26:07 | ||
81 | [sshd_config] | ||
82 | type: ok markus@ | ||
83 | - deraadt@cvs.openbsd.org 2001/02/06 22:07:50 | ||
84 | [sshd_config] | ||
85 | enable sftp-server by default | ||
80 | - (bal) fixed sftp-client.c. Return 'status' instead of '0' | 86 | - (bal) fixed sftp-client.c. Return 'status' instead of '0' |
81 | (from the OpenBSD tree) | 87 | (from the OpenBSD tree) |
82 | - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD | 88 | - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD |
@@ -3864,4 +3870,4 @@ | |||
3864 | - Wrote replacements for strlcpy and mkdtemp | 3870 | - Wrote replacements for strlcpy and mkdtemp |
3865 | - Released 1.0pre1 | 3871 | - Released 1.0pre1 |
3866 | 3872 | ||
3867 | $Id: ChangeLog,v 1.733 2001/02/10 23:21:09 mouring Exp $ | 3873 | $Id: ChangeLog,v 1.734 2001/02/10 23:26:35 mouring Exp $ |
diff --git a/sshd_config b/sshd_config index 9ba1789a4..8d0af1060 100644 --- a/sshd_config +++ b/sshd_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sshd_config,v 1.30 2001/02/03 10:19:51 markus Exp $ | 1 | # $OpenBSD: sshd_config,v 1.32 2001/02/06 22:07:50 deraadt Exp $ |
2 | 2 | ||
3 | # This is the sshd server system-wide configuration file. See sshd(8) | 3 | # This is the sshd server system-wide configuration file. See sshd(8) |
4 | # for more information. | 4 | # for more information. |
@@ -42,7 +42,7 @@ PasswordAuthentication yes | |||
42 | PermitEmptyPasswords no | 42 | PermitEmptyPasswords no |
43 | 43 | ||
44 | # Uncomment to disable s/key passwords | 44 | # Uncomment to disable s/key passwords |
45 | #ChallengeResposeAuthentication no | 45 | #ChallengeResponseAuthentication no |
46 | 46 | ||
47 | # To change Kerberos options | 47 | # To change Kerberos options |
48 | #KerberosAuthentication no | 48 | #KerberosAuthentication no |
@@ -56,8 +56,8 @@ PermitEmptyPasswords no | |||
56 | #CheckMail yes | 56 | #CheckMail yes |
57 | #UseLogin no | 57 | #UseLogin no |
58 | 58 | ||
59 | # Uncomment if you want to enable sftp | ||
60 | #Subsystem sftp /usr/libexec/sftp-server | ||
61 | #MaxStartups 10:30:60 | 59 | #MaxStartups 10:30:60 |
62 | #Banner /etc/issue.net | 60 | #Banner /etc/issue.net |
63 | #ReverseMappingCheck yes | 61 | #ReverseMappingCheck yes |
62 | |||
63 | Subsystem sftp /usr/libexec/sftp-server | ||