Print this page
6485 sun-ssh isn't happy with /etc/ssh/moduli contents after 6440
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>

@@ -30,11 +30,13 @@
 
 SSHASKPASS=     $(ROOTLIBSSH)/ssh-askpass
 ETCSSHDIR=      $(ROOTETC)/ssh
 DIRS=           $(ETCSSHDIR) $(ROOTLIBSSH) $(ROOTLIBSUNSSH)
 
-FILES= sshd_config ssh_config moduli
+FILES= sshd_config ssh_config moduli.sunssh
+
+ETCSSHLINKS= $(ETCSSHDIR)/moduli
 
 ETCSSHFILES=    $(FILES:%=$(ETCSSHDIR)/%)
 
 $(ETCSSHFILES) := FILEMODE=     644
 

@@ -44,18 +46,21 @@
         $(INS.file)
 
 $(DIRS):
         $(INS.dir)
 
+$(ETCSSHDIR)/moduli: $(ETCSSHDIR)/moduli.sunssh
+        -$(RM) $@; $(SYMLINK) moduli.sunssh $@
+
 $(ROOTLIBSSH)/%: %
         $(INS.file)
 
 $(POFILE):
 
 all lint clean clobber _msg:
 
-install: all $(DIRS) $(ETCSSHFILES) $(ROOTMANIFEST) $(ROOTSVCMETHOD) \
+install: all $(DIRS) $(ETCSSHFILES) $(ETCSSHLINKS) $(ROOTMANIFEST) $(ROOTSVCMETHOD) \
         $(SSHASKPASS)
 
 check: $(CHKMANIFEST)
 
 include ../../Makefile.targ