Mercurial > dropbear
diff scp.c @ 641:2b1bb792cd4d dropbear-tfm
- Update tfm changes to current default tip
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Mon, 21 Nov 2011 19:52:28 +0800 |
| parents | cf5a167776c3 |
| children | 0ad95abf8d3c |
line wrap: on
line diff
--- a/scp.c Mon Nov 21 19:19:57 2011 +0800 +++ b/scp.c Mon Nov 21 19:52:28 2011 +0800 @@ -343,7 +343,7 @@ addargs(&args, "-p%s", optarg); break; case 'B': - addargs(&args, "-oBatchmode yes"); + fprintf(stderr, "Note: -B option is disabled in this version of scp"); break; case 'l': speed = strtod(optarg, &endp); @@ -492,9 +492,13 @@ addargs(&alist, "%s", ssh_program); if (verbose_mode) addargs(&alist, "-v"); +#if 0 + // Disabled since dbclient won't understand them + // and scp works fine without them. addargs(&alist, "-x"); addargs(&alist, "-oClearAllForwardings yes"); addargs(&alist, "-n"); +#endif *src++ = 0; if (*src == 0) @@ -769,7 +773,7 @@ { static struct timeval bwstart, bwend; static int lamt, thresh = 16384; - u_int64_t waitlen; + uint64_t waitlen; struct timespec ts, rm; if (!timerisset(&bwstart)) {