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>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/ssh/etc/Makefile
          +++ new/usr/src/cmd/ssh/etc/Makefile
↓ open down ↓ 24 lines elided ↑ open up ↑
  25   25  MANIFEST = ssh.xml
  26   26  SVCMETHOD = sshd
  27   27  
  28   28  include ../../Makefile.cmd
  29   29  include ../Makefile.ssh-common
  30   30  
  31   31  SSHASKPASS=     $(ROOTLIBSSH)/ssh-askpass
  32   32  ETCSSHDIR=      $(ROOTETC)/ssh
  33   33  DIRS=           $(ETCSSHDIR) $(ROOTLIBSSH) $(ROOTLIBSUNSSH)
  34   34  
  35      -FILES= sshd_config ssh_config moduli
       35 +FILES= sshd_config ssh_config moduli.sunssh
       36 +
       37 +ETCSSHLINKS= $(ETCSSHDIR)/moduli
  36   38  
  37   39  ETCSSHFILES=    $(FILES:%=$(ETCSSHDIR)/%)
  38   40  
  39   41  $(ETCSSHFILES) := FILEMODE=     644
  40   42  
  41   43  ROOTMANIFESTDIR = $(ROOTSVCNETWORK)
  42   44  
  43   45  $(ETCSSHDIR)/% : %
  44   46          $(INS.file)
  45   47  
  46   48  $(DIRS):
  47   49          $(INS.dir)
  48   50  
       51 +$(ETCSSHDIR)/moduli: $(ETCSSHDIR)/moduli.sunssh
       52 +        -$(RM) $@; $(SYMLINK) moduli.sunssh $@
       53 +
  49   54  $(ROOTLIBSSH)/%: %
  50   55          $(INS.file)
  51   56  
  52   57  $(POFILE):
  53   58  
  54   59  all lint clean clobber _msg:
  55   60  
  56      -install: all $(DIRS) $(ETCSSHFILES) $(ROOTMANIFEST) $(ROOTSVCMETHOD) \
       61 +install: all $(DIRS) $(ETCSSHFILES) $(ETCSSHLINKS) $(ROOTMANIFEST) $(ROOTSVCMETHOD) \
  57   62          $(SSHASKPASS)
  58   63  
  59   64  check: $(CHKMANIFEST)
  60   65  
  61   66  include ../../Makefile.targ
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX