← Back to branch summary

~ubuntu-branches/ubuntu/vivid/dropbear/vivid-proposed

« back to all changes in this revision

Viewing changes to scp.c

  • Committer: Package Import Robot
  • Author(s): Mattia Rizzolo
  • Date: 2014-08-12 11:04:21 UTC
  • mfrom: (14.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20140812110421-4s76v0605k6uuvxv
Tags: 2014.65-1ubuntu1
https://launchpad.net/bugs/1355670
* Merge from Debian unstable. (LP: #1355670) Remaining changes:
  + debian/initramfs/premount-devpts, debian/rules: drop the script, this is
    handled by initramfs-tools.
  + debian/initramfs/dropbear-hook: do not install dropbear in the initramfs
    if there's no uncommented line in /etc/crypttab.
  + debian/initramfs/premout-dropbear: fix so that the network configuration
    happens before dropbear takes hold of the network card.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scp.c
494
494
                        if (verbose_mode)
495
495
                                addargs(&alist, "-v");
496
496
#if 0
497
 
                        // Disabled since dbclient won't understand them
498
 
                        // and scp works fine without them.
 
497
                        /* Disabled since dbclient won't understand them
 
498
                           and scp works fine without them. */
499
499
                        addargs(&alist, "-x");
500
500
                        addargs(&alist, "-oClearAllForwardings yes");
501
501
                        addargs(&alist, "-n");