summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sshd.830
2 files changed, 24 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index b181a8cae..880d2cc2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,12 @@
23 [readconf.c clientloop.c] 23 [readconf.c clientloop.c]
24 remove some bogus *p tests from charles longeau 24 remove some bogus *p tests from charles longeau
25 ok deraadt millert 25 ok deraadt millert
26 - jmc@cvs.openbsd.org 2007/03/20 15:57:15
27 [sshd.8]
28 - let synopsis and description agree for -f
29 - sort FILES
30 - +.Xr ssh-keyscan 1 ,
31 from Igor Sobrado
26 32
2720070313 3320070313
28 - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include 34 - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
@@ -2852,4 +2858,4 @@
2852 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2858 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2853 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2859 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2854 2860
2855$Id: ChangeLog,v 1.4644 2007/03/21 09:46:03 dtucker Exp $ 2861$Id: ChangeLog,v 1.4645 2007/03/21 09:46:54 dtucker Exp $
diff --git a/sshd.8 b/sshd.8
index 522279ee3..ceae32f5a 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.234 2006/08/21 08:15:57 dtucker Exp $ 37.\" $OpenBSD: sshd.8,v 1.235 2007/03/20 15:57:15 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -58,8 +58,11 @@
58.Nm 58.Nm
59(OpenSSH Daemon) is the daemon program for 59(OpenSSH Daemon) is the daemon program for
60.Xr ssh 1 . 60.Xr ssh 1 .
61Together these programs replace rlogin and rsh, and 61Together these programs replace
62provide secure encrypted communications between two untrusted hosts 62.Xr rlogin 1
63and
64.Xr rsh 1 ,
65and provide secure encrypted communications between two untrusted hosts
63over an insecure network. 66over an insecure network.
64.Pp 67.Pp
65.Nm 68.Nm
@@ -117,7 +120,7 @@ Maximum is 3.
117When this option is specified, 120When this option is specified,
118.Nm 121.Nm
119will send the output to the standard error instead of the system log. 122will send the output to the standard error instead of the system log.
120.It Fl f Ar configuration_file 123.It Fl f Ar config_file
121Specifies the name of the configuration file. 124Specifies the name of the configuration file.
122The default is 125The default is
123.Pa /etc/ssh/sshd_config . 126.Pa /etc/ssh/sshd_config .
@@ -758,15 +761,6 @@ This file is used in exactly the same way as
758but allows host-based authentication without permitting login with 761but allows host-based authentication without permitting login with
759rlogin/rsh. 762rlogin/rsh.
760.Pp 763.Pp
761.It /etc/ssh/ssh_known_hosts
762Systemwide list of known host keys.
763This file should be prepared by the
764system administrator to contain the public host keys of all machines in the
765organization.
766The format of this file is described above.
767This file should be writable only by root/the owner and
768should be world-readable.
769.Pp
770.It /etc/ssh/ssh_host_key 764.It /etc/ssh/ssh_host_key
771.It /etc/ssh/ssh_host_dsa_key 765.It /etc/ssh/ssh_host_dsa_key
772.It /etc/ssh/ssh_host_rsa_key 766.It /etc/ssh/ssh_host_rsa_key
@@ -790,6 +784,15 @@ the user so their contents can be copied to known hosts files.
790These files are created using 784These files are created using
791.Xr ssh-keygen 1 . 785.Xr ssh-keygen 1 .
792.Pp 786.Pp
787.It /etc/ssh/ssh_known_hosts
788Systemwide list of known host keys.
789This file should be prepared by the
790system administrator to contain the public host keys of all machines in the
791organization.
792The format of this file is described above.
793This file should be writable only by root/the owner and
794should be world-readable.
795.Pp
793.It /etc/ssh/sshd_config 796.It /etc/ssh/sshd_config
794Contains configuration data for 797Contains configuration data for
795.Nm sshd . 798.Nm sshd .
@@ -826,6 +829,7 @@ The content of this file is not sensitive; it can be world-readable.
826.Xr ssh-add 1 , 829.Xr ssh-add 1 ,
827.Xr ssh-agent 1 , 830.Xr ssh-agent 1 ,
828.Xr ssh-keygen 1 , 831.Xr ssh-keygen 1 ,
832.Xr ssh-keyscan 1 ,
829.Xr chroot 2 , 833.Xr chroot 2 ,
830.Xr hosts_access 5 , 834.Xr hosts_access 5 ,
831.Xr login.conf 5 , 835.Xr login.conf 5 ,