diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-07 14:58:33 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-07 14:58:33 +0000 |
| commit | baef2f5cb916acb42bdcfa12530e8a2815d90bc6 (patch) | |
| tree | 4a3d83dfcb3a3f956f3e5fd51268fe174ef922a4 /usr/src/pkg/manifests/service-network-ssh-common.mf | |
| parent | 1d5a53363c27489cc8b2086775b98eaec3cdb458 (diff) | |
| parent | 5690df7e59608f4ee5c051c27524c9d55186cf58 (diff) | |
| download | illumos-joyent-baef2f5cb916acb42bdcfa12530e8a2815d90bc6.tar.gz | |
[illumos-gate merge]
commit 5690df7e59608f4ee5c051c27524c9d55186cf58
6498 typo in libavl(3LIB) man page
commit ba9ca9119d43e9c8e21e14f2129dce27d2dc0cdc
5468 Missing dependencies in lib/Makefile
commit 62ef8476c4f1cb016de161827d921418dee4b031
4008 libdladm should not have a curses UI inside
commit e8ea23086f5fd6f2b2f60c03b98d019041a374a2
6485 sun-ssh isn't happy with /etc/ssh/moduli contents after 6440
Conflicts:
usr/src/lib/libdladm/Makefile.com
usr/src/cmd/ssh/etc/Makefile
usr/src/lib/Makefile
usr/src/cmd/flowstat/flowstat.c
usr/src/cmd/dladm/dladm.c
Diffstat (limited to 'usr/src/pkg/manifests/service-network-ssh-common.mf')
| -rw-r--r-- | usr/src/pkg/manifests/service-network-ssh-common.mf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/pkg/manifests/service-network-ssh-common.mf b/usr/src/pkg/manifests/service-network-ssh-common.mf index 130a04235c..a51f0d0559 100644 --- a/usr/src/pkg/manifests/service-network-ssh-common.mf +++ b/usr/src/pkg/manifests/service-network-ssh-common.mf @@ -31,7 +31,7 @@ dir path=lib/svc/method dir path=usr group=sys dir path=usr/share/man dir path=usr/share/man/man4 -file path=etc/ssh/moduli group=sys preserve=true +file path=etc/ssh/moduli.sunssh group=sys preserve=true file path=etc/ssh/ssh_config group=sys \ original_name=network/ssh:etc/ssh/ssh_config preserve=true file path=etc/ssh/sshd_config group=sys \ @@ -42,6 +42,8 @@ file path=usr/share/man/man4/ssh_config.sunssh.4 file path=usr/share/man/man4/sshd_config.sunssh.4 license usr/src/cmd/ssh/THIRDPARTYLICENSE \ license=usr/src/cmd/ssh/THIRDPARTYLICENSE +link path=etc/ssh/moduli mediator=ssh mediator-implementation=sunssh \ + target=moduli.sunssh link path=usr/share/man/man4/ssh_config.4 mediator=ssh \ mediator-implementation=sunssh target=ssh_config.sunssh.4 link path=usr/share/man/man4/sshd_config.4 mediator=ssh \ |