Print this page
First stab at the full Joyent wad (still needs work!!!)
*** 1,17 ****
! From 0b784f8f36fc30f8722e784777fe012062beb0d3 Mon Sep 17 00:00:00 2001
From: oracle <solaris@oracle.com>
Date: Mon, 3 Aug 2015 14:34:55 -0700
! Subject: [PATCH 04/30] Reorganise man pages into Illumos numbering, adjust
text
---
Makefile.in | 22 +-
moduli.4 | 127 ++++
moduli.5 | 127 ----
sftp-server.1m | 170 +++++
sftp-server.8 | 170 -----
ssh-keysign.1m | 93 +++
ssh-keysign.8 | 93 ---
ssh-pkcs11-helper.1m | 43 ++
ssh-pkcs11-helper.8 | 43 --
ssh_config.4 | 1726 +++++++++++++++++++++++++++++++++++++++++++++++++
--- 1,18 ----
! From 310f67442b9faf22eb3a30a614202cdd04f99119 Mon Sep 17 00:00:00 2001
From: oracle <solaris@oracle.com>
Date: Mon, 3 Aug 2015 14:34:55 -0700
! Subject: [PATCH 06/36] Reorganise man pages into Illumos numbering, adjust
text
---
Makefile.in | 22 +-
moduli.4 | 127 ++++
moduli.5 | 127 ----
sftp-server.1m | 170 +++++
sftp-server.8 | 170 -----
+ ssh-keygen.1 | 6 +-
ssh-keysign.1m | 93 +++
ssh-keysign.8 | 93 ---
ssh-pkcs11-helper.1m | 43 ++
ssh-pkcs11-helper.8 | 43 --
ssh_config.4 | 1726 +++++++++++++++++++++++++++++++++++++++++++++++++
*** 18,28 ****
ssh_config.5 | 1726 -------------------------------------------------
sshd.1m | 971 ++++++++++++++++++++++++++++
sshd.8 | 971 ----------------------------
sshd_config.4 | 1736 ++++++++++++++++++++++++++++++++++++++++++++++++++
sshd_config.5 | 1736 --------------------------------------------------
! 15 files changed, 4877 insertions(+), 4877 deletions(-)
create mode 100644 moduli.4
delete mode 100644 moduli.5
create mode 100644 sftp-server.1m
delete mode 100644 sftp-server.8
create mode 100644 ssh-keysign.1m
--- 19,29 ----
ssh_config.5 | 1726 -------------------------------------------------
sshd.1m | 971 ++++++++++++++++++++++++++++
sshd.8 | 971 ----------------------------
sshd_config.4 | 1736 ++++++++++++++++++++++++++++++++++++++++++++++++++
sshd_config.5 | 1736 --------------------------------------------------
! 16 files changed, 4879 insertions(+), 4881 deletions(-)
create mode 100644 moduli.4
delete mode 100644 moduli.5
create mode 100644 sftp-server.1m
delete mode 100644 sftp-server.8
create mode 100644 ssh-keysign.1m
*** 35,59 ****
delete mode 100644 sshd.8
create mode 100644 sshd_config.4
delete mode 100644 sshd_config.5
diff --git a/Makefile.in b/Makefile.in
! index 8e52bca..0dd46b1 100644
--- a/Makefile.in
+++ b/Makefile.in
! @@ -112,8 +112,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
! sandbox-seccomp-filter.o sandbox-capsicum.o
-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
-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
+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
+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
MANTYPE = @MANTYPE@
CONFIGFILES=sshd_config.out ssh_config.out moduli.out
! @@ -307,8 +307,8 @@ install-files:
$(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
--- 36,60 ----
delete mode 100644 sshd.8
create mode 100644 sshd_config.4
delete mode 100644 sshd_config.5
diff --git a/Makefile.in b/Makefile.in
! index bc4660f..9f953e1 100644
--- a/Makefile.in
+++ b/Makefile.in
! @@ -113,8 +113,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
! sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-solaris.o
-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
-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
+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
+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
MANTYPE = @MANTYPE@
CONFIGFILES=sshd_config.out ssh_config.out moduli.out
! @@ -308,8 +308,8 @@ install-files:
$(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
*** 60,70 ****
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)4
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1m
$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
! @@ -328,14 +328,14 @@ install-files:
$(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
$(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
$(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
- $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
- $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
--- 61,71 ----
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)4
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1m
$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
! @@ -329,14 +329,14 @@ install-files:
$(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
$(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
$(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
- $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
- $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
*** 700,709 ****
--- 701,734 ----
-.Nm
-first appeared in
-.Ox 2.8 .
-.Sh AUTHORS
-.An Markus Friedl Aq Mt markus@openbsd.org
+ diff --git a/ssh-keygen.1 b/ssh-keygen.1
+ index ed17a08..9616030 100644
+ --- a/ssh-keygen.1
+ +++ b/ssh-keygen.1
+ @@ -174,9 +174,7 @@ key in
+ .Pa ~/.ssh/id_ed25519
+ or
+ .Pa ~/.ssh/id_rsa .
+ -Additionally, the system administrator may use this to generate host keys,
+ -as seen in
+ -.Pa /etc/rc .
+ +Additionally, the system administrator may use this to generate host keys.
+ .Pp
+ Normally this program generates the key and asks for a file in which
+ to store the private key.
+ @@ -224,7 +222,7 @@ for which host keys
+ do not exist, generate the host keys with the default key file path,
+ an empty passphrase, default bits for the key type, and default comment.
+ This is used by
+ -.Pa /etc/rc
+ +.Pa /lib/svc/method/sshd
+ to generate new host keys.
+ .It Fl a Ar rounds
+ When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
diff --git a/ssh-keysign.1m b/ssh-keysign.1m
new file mode 100644
index 0000000..60c96ad
--- /dev/null
+++ b/ssh-keysign.1m
*** 4462,4472 ****
-created OpenSSH.
-Markus Friedl contributed the support for SSH
-protocol versions 1.5 and 2.0.
diff --git a/sshd.1m b/sshd.1m
new file mode 100644
! index 0000000..967a753
--- /dev/null
+++ b/sshd.1m
@@ -0,0 +1,971 @@
+.\"
+.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
--- 4487,4497 ----
-created OpenSSH.
-Markus Friedl contributed the support for SSH
-protocol versions 1.5 and 2.0.
diff --git a/sshd.1m b/sshd.1m
new file mode 100644
! index 0000000..ada4f25
--- /dev/null
+++ b/sshd.1m
@@ -0,0 +1,971 @@
+.\"
+.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
*** 4534,4545 ****
+and provide secure encrypted communications between two untrusted hosts
+over an insecure network.
+.Pp
+.Nm
+listens for connections from clients.
! +It is normally started at boot from
! +.Pa /etc/rc .
+It forks a new
+daemon for each incoming connection.
+The forked daemons handle
+key exchange, encryption, authentication, command execution,
+and data exchange.
--- 4559,4570 ----
+and provide secure encrypted communications between two untrusted hosts
+over an insecure network.
+.Pp
+.Nm
+listens for connections from clients.
! +It is normally started at boot by
! +.Xr smf 5 .
+It forks a new
+daemon for each incoming connection.
+The forked daemons handle
+key exchange, encryption, authentication, command execution,
+and data exchange.
*** 9899,9905 ****
-Markus Friedl contributed the support for SSH
-protocol versions 1.5 and 2.0.
-Niels Provos and Markus Friedl contributed support
-for privilege separation.
--
! 2.3.2 (Apple Git-55)
--- 9924,9930 ----
-Markus Friedl contributed the support for SSH
-protocol versions 1.5 and 2.0.
-Niels Provos and Markus Friedl contributed support
-for privilege separation.
--
! 2.5.4 (Apple Git-61)