1 From 0b784f8f36fc30f8722e784777fe012062beb0d3 Mon Sep 17 00:00:00 2001
2 From: oracle <solaris@oracle.com>
3 Date: Mon, 3 Aug 2015 14:34:55 -0700
4 Subject: [PATCH 04/30] Reorganise man pages into Illumos numbering, adjust
5 text
6
7 ---
8 Makefile.in | 22 +-
9 moduli.4 | 127 ++++
10 moduli.5 | 127 ----
11 sftp-server.1m | 170 +++++
12 sftp-server.8 | 170 -----
13 ssh-keysign.1m | 93 +++
14 ssh-keysign.8 | 93 ---
15 ssh-pkcs11-helper.1m | 43 ++
16 ssh-pkcs11-helper.8 | 43 --
17 ssh_config.4 | 1726 +++++++++++++++++++++++++++++++++++++++++++++++++
18 ssh_config.5 | 1726 -------------------------------------------------
19 sshd.1m | 971 ++++++++++++++++++++++++++++
20 sshd.8 | 971 ----------------------------
21 sshd_config.4 | 1736 ++++++++++++++++++++++++++++++++++++++++++++++++++
22 sshd_config.5 | 1736 --------------------------------------------------
23 15 files changed, 4877 insertions(+), 4877 deletions(-)
24 create mode 100644 moduli.4
25 delete mode 100644 moduli.5
26 create mode 100644 sftp-server.1m
27 delete mode 100644 sftp-server.8
28 create mode 100644 ssh-keysign.1m
29 delete mode 100644 ssh-keysign.8
30 create mode 100644 ssh-pkcs11-helper.1m
31 delete mode 100644 ssh-pkcs11-helper.8
32 create mode 100644 ssh_config.4
33 delete mode 100644 ssh_config.5
34 create mode 100644 sshd.1m
35 delete mode 100644 sshd.8
36 create mode 100644 sshd_config.4
37 delete mode 100644 sshd_config.5
38
39 diff --git a/Makefile.in b/Makefile.in
40 index 8e52bca..0dd46b1 100644
41 --- a/Makefile.in
42 +++ b/Makefile.in
43 @@ -112,8 +112,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
44 sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
45 sandbox-seccomp-filter.o sandbox-capsicum.o
46
47 -MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
48 -MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
49 +MANPAGES = moduli.4.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.1m.out sftp-server.1m.out sftp.1.out ssh-keysign.1m.out ssh-pkcs11-helper.1m.out sshd_config.4.out ssh_config.4.out
50 +MANPAGES_IN = moduli.4 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.1m sftp-server.1m sftp.1 ssh-keysign.1m ssh-pkcs11-helper.1m sshd_config.4 ssh_config.4
51 MANTYPE = @MANTYPE@
52
53 CONFIGFILES=sshd_config.out ssh_config.out moduli.out
54 @@ -307,8 +307,8 @@ install-files:
55 $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
56 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
57 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
58 - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
59 - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
60 + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)4
61 + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1m
62 $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
63 (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
64 $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
65 @@ -328,14 +328,14 @@ install-files:
66 $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
67 $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
68 $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
69 - $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
70 - $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
71 - $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
72 - $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
73 + $(INSTALL) -m 644 moduli.4.out $(DESTDIR)$(mandir)/$(mansubdir)4/moduli.4
74 + $(INSTALL) -m 644 sshd_config.4.out $(DESTDIR)$(mandir)/$(mansubdir)4/sshd_config.4
75 + $(INSTALL) -m 644 ssh_config.4.out $(DESTDIR)$(mandir)/$(mansubdir)4/ssh_config.4
76 + $(INSTALL) -m 644 sshd.1m.out $(DESTDIR)$(mandir)/$(mansubdir)1m/sshd.1m
77 $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
78 - $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
79 - $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
80 - $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
81 + $(INSTALL) -m 644 sftp-server.1m.out $(DESTDIR)$(mandir)/$(mansubdir)1m/sftp-server.1m
82 + $(INSTALL) -m 644 ssh-keysign.1m.out $(DESTDIR)$(mandir)/$(mansubdir)1m/ssh-keysign.1m
83 + $(INSTALL) -m 644 ssh-pkcs11-helper.1m.out $(DESTDIR)$(mandir)/$(mansubdir)1m/ssh-pkcs11-helper.1m
84 -rm -f $(DESTDIR)$(bindir)/slogin
85 ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
685 -establish a logging socket inside the chroot directory.
686 -.Sh SEE ALSO
687 -.Xr sftp 1 ,
688 -.Xr ssh 1 ,
689 -.Xr sshd_config 5 ,
690 -.Xr sshd 8
691 -.Rs
692 -.%A T. Ylonen
693 -.%A S. Lehtinen
694 -.%T "SSH File Transfer Protocol"
695 -.%N draft-ietf-secsh-filexfer-02.txt
696 -.%D October 2001
697 -.%O work in progress material
698 -.Re
699 -.Sh HISTORY
700 -.Nm
701 -first appeared in
702 -.Ox 2.8 .
703 -.Sh AUTHORS
704 -.An Markus Friedl Aq Mt markus@openbsd.org
705 diff --git a/ssh-keysign.1m b/ssh-keysign.1m
706 new file mode 100644
707 index 0000000..60c96ad
708 --- /dev/null
709 +++ b/ssh-keysign.1m
710 @@ -0,0 +1,93 @@
711 +.\" $OpenBSD: ssh-keysign.8,v 1.14 2013/12/07 11:58:46 naddy Exp $
712 +.\"
713 +.\" Copyright (c) 2002 Markus Friedl. All rights reserved.
714 +.\"
715 +.\" Redistribution and use in source and binary forms, with or without
716 +.\" modification, are permitted provided that the following conditions
717 +.\" are met:
718 +.\" 1. Redistributions of source code must retain the above copyright
719 +.\" notice, this list of conditions and the following disclaimer.
720 +.\" 2. Redistributions in binary form must reproduce the above copyright
721 +.\" notice, this list of conditions and the following disclaimer in the
722 +.\" documentation and/or other materials provided with the distribution.
723 +.\"
724 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
4447 -.It Pa /etc/ssh/ssh_config
4448 -Systemwide configuration file.
4449 -This file provides defaults for those
4450 -values that are not specified in the user's configuration file, and
4451 -for those users who do not have a configuration file.
4452 -This file must be world-readable.
4453 -.El
4454 -.Sh SEE ALSO
4455 -.Xr ssh 1
4456 -.Sh AUTHORS
4457 -OpenSSH is a derivative of the original and free
4458 -ssh 1.2.12 release by Tatu Ylonen.
4459 -Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
4460 -Theo de Raadt and Dug Song
4461 -removed many bugs, re-added newer features and
4462 -created OpenSSH.
4463 -Markus Friedl contributed the support for SSH
4464 -protocol versions 1.5 and 2.0.
4465 diff --git a/sshd.1m b/sshd.1m
4466 new file mode 100644
4467 index 0000000..967a753
4468 --- /dev/null
4469 +++ b/sshd.1m
4470 @@ -0,0 +1,971 @@
4471 +.\"
4472 +.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4473 +.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4474 +.\" All rights reserved
4475 +.\"
4476 +.\" As far as I am concerned, the code I have written for this software
4477 +.\" can be used freely for any purpose. Any derived versions of this
4478 +.\" software must be clearly marked as such, and if the derived work is
4479 +.\" incompatible with the protocol description in the RFC file, it must be
4480 +.\" called by a name other than "ssh" or "Secure Shell".
4481 +.\"
4482 +.\" Copyright (c) 1999,2000 Markus Friedl. All rights reserved.
4483 +.\" Copyright (c) 1999 Aaron Campbell. All rights reserved.
4484 +.\" Copyright (c) 1999 Theo de Raadt. All rights reserved.
4485 +.\"
4486 +.\" Redistribution and use in source and binary forms, with or without
4487 +.\" modification, are permitted provided that the following conditions
4519 +.Op Fl c Ar host_certificate_file
4520 +.Op Fl E Ar log_file
4521 +.Op Fl f Ar config_file
4522 +.Op Fl g Ar login_grace_time
4523 +.Op Fl h Ar host_key_file
4524 +.Op Fl k Ar key_gen_time
4525 +.Op Fl o Ar option
4526 +.Op Fl p Ar port
4527 +.Op Fl u Ar len
4528 +.Ek
4529 +.Sh DESCRIPTION
4530 +.Nm
4531 +(OpenSSH Daemon) is the daemon program for
4532 +.Xr ssh 1 .
4533 +Together these programs replace rlogin and rsh,
4534 +and provide secure encrypted communications between two untrusted hosts
4535 +over an insecure network.
4536 +.Pp
4537 +.Nm
4538 +listens for connections from clients.
4539 +It is normally started at boot from
4540 +.Pa /etc/rc .
4541 +It forks a new
4542 +daemon for each incoming connection.
4543 +The forked daemons handle
4544 +key exchange, encryption, authentication, command execution,
4545 +and data exchange.
4546 +.Pp
4547 +.Nm
4548 +can be configured using command-line options or a configuration file
4549 +(by default
4550 +.Xr sshd_config 4 ) ;
4551 +command-line options override values specified in the
4552 +configuration file.
4553 +.Nm
4554 +rereads its configuration file when it receives a hangup signal,
4555 +.Dv SIGHUP ,
4556 +by executing itself with the name and options it was started with, e.g.\&
4557 +.Pa /usr/sbin/sshd .
4558 +.Pp
4559 +The options are as follows:
4560 +.Bl -tag -width Ds
9884 -Contains configuration data for
9885 -.Xr sshd 8 .
9886 -This file should be writable by root only, but it is recommended
9887 -(though not necessary) that it be world-readable.
9888 -.El
9889 -.Sh SEE ALSO
9890 -.Xr sshd 8 ,
9891 -.Xr pam_unix_session 5
9892 -.Sh AUTHORS
9893 -OpenSSH is a derivative of the original and free
9894 -ssh 1.2.12 release by Tatu Ylonen.
9895 -Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
9896 -Theo de Raadt and Dug Song
9897 -removed many bugs, re-added newer features and
9898 -created OpenSSH.
9899 -Markus Friedl contributed the support for SSH
9900 -protocol versions 1.5 and 2.0.
9901 -Niels Provos and Markus Friedl contributed support
9902 -for privilege separation.
9903 --
9904 2.3.2 (Apple Git-55)
9905
|
1 From 310f67442b9faf22eb3a30a614202cdd04f99119 Mon Sep 17 00:00:00 2001
2 From: oracle <solaris@oracle.com>
3 Date: Mon, 3 Aug 2015 14:34:55 -0700
4 Subject: [PATCH 06/36] Reorganise man pages into Illumos numbering, adjust
5 text
6
7 ---
8 Makefile.in | 22 +-
9 moduli.4 | 127 ++++
10 moduli.5 | 127 ----
11 sftp-server.1m | 170 +++++
12 sftp-server.8 | 170 -----
13 ssh-keygen.1 | 6 +-
14 ssh-keysign.1m | 93 +++
15 ssh-keysign.8 | 93 ---
16 ssh-pkcs11-helper.1m | 43 ++
17 ssh-pkcs11-helper.8 | 43 --
18 ssh_config.4 | 1726 +++++++++++++++++++++++++++++++++++++++++++++++++
19 ssh_config.5 | 1726 -------------------------------------------------
20 sshd.1m | 971 ++++++++++++++++++++++++++++
21 sshd.8 | 971 ----------------------------
22 sshd_config.4 | 1736 ++++++++++++++++++++++++++++++++++++++++++++++++++
23 sshd_config.5 | 1736 --------------------------------------------------
24 16 files changed, 4879 insertions(+), 4881 deletions(-)
25 create mode 100644 moduli.4
26 delete mode 100644 moduli.5
27 create mode 100644 sftp-server.1m
28 delete mode 100644 sftp-server.8
29 create mode 100644 ssh-keysign.1m
30 delete mode 100644 ssh-keysign.8
31 create mode 100644 ssh-pkcs11-helper.1m
32 delete mode 100644 ssh-pkcs11-helper.8
33 create mode 100644 ssh_config.4
34 delete mode 100644 ssh_config.5
35 create mode 100644 sshd.1m
36 delete mode 100644 sshd.8
37 create mode 100644 sshd_config.4
38 delete mode 100644 sshd_config.5
39
40 diff --git a/Makefile.in b/Makefile.in
41 index bc4660f..9f953e1 100644
42 --- a/Makefile.in
43 +++ b/Makefile.in
44 @@ -113,8 +113,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
45 sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
46 sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-solaris.o
47
48 -MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
49 -MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
50 +MANPAGES = moduli.4.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.1m.out sftp-server.1m.out sftp.1.out ssh-keysign.1m.out ssh-pkcs11-helper.1m.out sshd_config.4.out ssh_config.4.out
51 +MANPAGES_IN = moduli.4 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.1m sftp-server.1m sftp.1 ssh-keysign.1m ssh-pkcs11-helper.1m sshd_config.4 ssh_config.4
52 MANTYPE = @MANTYPE@
53
54 CONFIGFILES=sshd_config.out ssh_config.out moduli.out
55 @@ -308,8 +308,8 @@ install-files:
56 $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
57 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
58 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
59 - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
60 - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
61 + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)4
62 + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1m
63 $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
64 (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
65 $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
66 @@ -329,14 +329,14 @@ install-files:
67 $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
68 $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
69 $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
70 - $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
71 - $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
72 - $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
73 - $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
74 + $(INSTALL) -m 644 moduli.4.out $(DESTDIR)$(mandir)/$(mansubdir)4/moduli.4
75 + $(INSTALL) -m 644 sshd_config.4.out $(DESTDIR)$(mandir)/$(mansubdir)4/sshd_config.4
76 + $(INSTALL) -m 644 ssh_config.4.out $(DESTDIR)$(mandir)/$(mansubdir)4/ssh_config.4
77 + $(INSTALL) -m 644 sshd.1m.out $(DESTDIR)$(mandir)/$(mansubdir)1m/sshd.1m
78 $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
79 - $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
80 - $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
81 - $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
82 + $(INSTALL) -m 644 sftp-server.1m.out $(DESTDIR)$(mandir)/$(mansubdir)1m/sftp-server.1m
83 + $(INSTALL) -m 644 ssh-keysign.1m.out $(DESTDIR)$(mandir)/$(mansubdir)1m/ssh-keysign.1m
84 + $(INSTALL) -m 644 ssh-pkcs11-helper.1m.out $(DESTDIR)$(mandir)/$(mansubdir)1m/ssh-pkcs11-helper.1m
85 -rm -f $(DESTDIR)$(bindir)/slogin
86 ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
686 -establish a logging socket inside the chroot directory.
687 -.Sh SEE ALSO
688 -.Xr sftp 1 ,
689 -.Xr ssh 1 ,
690 -.Xr sshd_config 5 ,
691 -.Xr sshd 8
692 -.Rs
693 -.%A T. Ylonen
694 -.%A S. Lehtinen
695 -.%T "SSH File Transfer Protocol"
696 -.%N draft-ietf-secsh-filexfer-02.txt
697 -.%D October 2001
698 -.%O work in progress material
699 -.Re
700 -.Sh HISTORY
701 -.Nm
702 -first appeared in
703 -.Ox 2.8 .
704 -.Sh AUTHORS
705 -.An Markus Friedl Aq Mt markus@openbsd.org
706 diff --git a/ssh-keygen.1 b/ssh-keygen.1
707 index ed17a08..9616030 100644
708 --- a/ssh-keygen.1
709 +++ b/ssh-keygen.1
710 @@ -174,9 +174,7 @@ key in
711 .Pa ~/.ssh/id_ed25519
712 or
713 .Pa ~/.ssh/id_rsa .
714 -Additionally, the system administrator may use this to generate host keys,
715 -as seen in
716 -.Pa /etc/rc .
717 +Additionally, the system administrator may use this to generate host keys.
718 .Pp
719 Normally this program generates the key and asks for a file in which
720 to store the private key.
721 @@ -224,7 +222,7 @@ for which host keys
722 do not exist, generate the host keys with the default key file path,
723 an empty passphrase, default bits for the key type, and default comment.
724 This is used by
725 -.Pa /etc/rc
726 +.Pa /lib/svc/method/sshd
727 to generate new host keys.
728 .It Fl a Ar rounds
729 When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
730 diff --git a/ssh-keysign.1m b/ssh-keysign.1m
731 new file mode 100644
732 index 0000000..60c96ad
733 --- /dev/null
734 +++ b/ssh-keysign.1m
735 @@ -0,0 +1,93 @@
736 +.\" $OpenBSD: ssh-keysign.8,v 1.14 2013/12/07 11:58:46 naddy Exp $
737 +.\"
738 +.\" Copyright (c) 2002 Markus Friedl. All rights reserved.
739 +.\"
740 +.\" Redistribution and use in source and binary forms, with or without
741 +.\" modification, are permitted provided that the following conditions
742 +.\" are met:
743 +.\" 1. Redistributions of source code must retain the above copyright
744 +.\" notice, this list of conditions and the following disclaimer.
745 +.\" 2. Redistributions in binary form must reproduce the above copyright
746 +.\" notice, this list of conditions and the following disclaimer in the
747 +.\" documentation and/or other materials provided with the distribution.
748 +.\"
749 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
4472 -.It Pa /etc/ssh/ssh_config
4473 -Systemwide configuration file.
4474 -This file provides defaults for those
4475 -values that are not specified in the user's configuration file, and
4476 -for those users who do not have a configuration file.
4477 -This file must be world-readable.
4478 -.El
4479 -.Sh SEE ALSO
4480 -.Xr ssh 1
4481 -.Sh AUTHORS
4482 -OpenSSH is a derivative of the original and free
4483 -ssh 1.2.12 release by Tatu Ylonen.
4484 -Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
4485 -Theo de Raadt and Dug Song
4486 -removed many bugs, re-added newer features and
4487 -created OpenSSH.
4488 -Markus Friedl contributed the support for SSH
4489 -protocol versions 1.5 and 2.0.
4490 diff --git a/sshd.1m b/sshd.1m
4491 new file mode 100644
4492 index 0000000..ada4f25
4493 --- /dev/null
4494 +++ b/sshd.1m
4495 @@ -0,0 +1,971 @@
4496 +.\"
4497 +.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4498 +.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4499 +.\" All rights reserved
4500 +.\"
4501 +.\" As far as I am concerned, the code I have written for this software
4502 +.\" can be used freely for any purpose. Any derived versions of this
4503 +.\" software must be clearly marked as such, and if the derived work is
4504 +.\" incompatible with the protocol description in the RFC file, it must be
4505 +.\" called by a name other than "ssh" or "Secure Shell".
4506 +.\"
4507 +.\" Copyright (c) 1999,2000 Markus Friedl. All rights reserved.
4508 +.\" Copyright (c) 1999 Aaron Campbell. All rights reserved.
4509 +.\" Copyright (c) 1999 Theo de Raadt. All rights reserved.
4510 +.\"
4511 +.\" Redistribution and use in source and binary forms, with or without
4512 +.\" modification, are permitted provided that the following conditions
4544 +.Op Fl c Ar host_certificate_file
4545 +.Op Fl E Ar log_file
4546 +.Op Fl f Ar config_file
4547 +.Op Fl g Ar login_grace_time
4548 +.Op Fl h Ar host_key_file
4549 +.Op Fl k Ar key_gen_time
4550 +.Op Fl o Ar option
4551 +.Op Fl p Ar port
4552 +.Op Fl u Ar len
4553 +.Ek
4554 +.Sh DESCRIPTION
4555 +.Nm
4556 +(OpenSSH Daemon) is the daemon program for
4557 +.Xr ssh 1 .
4558 +Together these programs replace rlogin and rsh,
4559 +and provide secure encrypted communications between two untrusted hosts
4560 +over an insecure network.
4561 +.Pp
4562 +.Nm
4563 +listens for connections from clients.
4564 +It is normally started at boot by
4565 +.Xr smf 5 .
4566 +It forks a new
4567 +daemon for each incoming connection.
4568 +The forked daemons handle
4569 +key exchange, encryption, authentication, command execution,
4570 +and data exchange.
4571 +.Pp
4572 +.Nm
4573 +can be configured using command-line options or a configuration file
4574 +(by default
4575 +.Xr sshd_config 4 ) ;
4576 +command-line options override values specified in the
4577 +configuration file.
4578 +.Nm
4579 +rereads its configuration file when it receives a hangup signal,
4580 +.Dv SIGHUP ,
4581 +by executing itself with the name and options it was started with, e.g.\&
4582 +.Pa /usr/sbin/sshd .
4583 +.Pp
4584 +The options are as follows:
4585 +.Bl -tag -width Ds
9909 -Contains configuration data for
9910 -.Xr sshd 8 .
9911 -This file should be writable by root only, but it is recommended
9912 -(though not necessary) that it be world-readable.
9913 -.El
9914 -.Sh SEE ALSO
9915 -.Xr sshd 8 ,
9916 -.Xr pam_unix_session 5
9917 -.Sh AUTHORS
9918 -OpenSSH is a derivative of the original and free
9919 -ssh 1.2.12 release by Tatu Ylonen.
9920 -Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
9921 -Theo de Raadt and Dug Song
9922 -removed many bugs, re-added newer features and
9923 -created OpenSSH.
9924 -Markus Friedl contributed the support for SSH
9925 -protocol versions 1.5 and 2.0.
9926 -Niels Provos and Markus Friedl contributed support
9927 -for privilege separation.
9928 --
9929 2.5.4 (Apple Git-61)
9930
|