Changeset 37a809f


Ignore:
Timestamp:
Aug 15, 2014 10:53:23 AM (5 years ago)
Author:
Ted Faber <faber@…>
Branches:
master
Children:
36e701e
Parents:
f74e3a1
Message:

ssh 6.5 parsing workaround

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/desktop_access.py

    rba07149 r37a809f  
    418418            print >>f,'while ! /usr/bin/scp -P %s -o "StrictHostKeyChecking no" -i %s %s:/usr/local/federation/etc/prep_done /dev/null; do' % (port, self.ssh_identity, peer)
    419419            print >>f, 'sleep 60; done'
    420             print >>f, ('ssh -w 0:0 -p %s -o "Tunnel ethernet" ' + \
     420            # Important safety tip:  ssh v 6.5 and above have a parsing bug
     421            # that means if you put -w before the -o "Tunnel ethernet"
     422            # parameter, you get a layer 3 tunnel instead of a layer 2 tunnel.
     423            # Don't move args in this line capricously.
     424            print >>f, ('ssh -p %s -o "Tunnel ethernet" -w 0:0 ' + \
    421425                    '-o "StrictHostKeyChecking no" -i %s %s perl ' +
    422426                    '-I/usr/local/federation/lib ' +
  • fedkit/fed-tun.pl

    rb641cc7 r37a809f  
    274274        # a tap device rather than a tun device.  Strict host key checking
    275275        # avoids asking the user to OK a strange host key.
    276         $cmd =  "$SSH -w $count:$count -o \"Tunnel ethernet\" " .
     276        #
     277        # Important safety tip:  ssh v 6.5 and above have a parsing bug
     278        # that means if you put -w before the -o "Tunnel ethernet"
     279        # parameter, you get a layer 3 tunnel instead of a layer 2 tunnel.
     280        # Don't move args in this line capricously.
     281        $cmd =  "$SSH -o \"Tunnel ethernet\" -w $count:$count " .
    277282            "-o \"StrictHostKeyChecking no\" " .
    278283            "$opts{'peer'}  \"$remote_script_dir/fed-tun.pl " .
Note: See TracChangeset for help on using the changeset viewer.