[c5c522c] | 1 | diff -urN netkit-ftp-0.17-pre20000412/ftp/ftp.1 netkit-ftp-0.17-pre20000412.new/ftp/ftp.1 |
---|
| 2 | --- netkit-ftp-0.17-pre20000412/ftp/ftp.1 Thu Apr 13 03:56:03 2000 |
---|
| 3 | +++ netkit-ftp-0.17-pre20000412.new/ftp/ftp.1 Wed Aug 16 14:13:10 2000 |
---|
| 4 | @@ -62,8 +62,10 @@ |
---|
| 5 | Use passive mode for data transfers. Allows use of ftp in environments |
---|
| 6 | where a firewall prevents connections from the outside world back to |
---|
| 7 | the client machine. Requires that the ftp server support the PASV |
---|
| 8 | -command. This is the default if invoked as |
---|
| 9 | -.Nm pftp. |
---|
| 10 | +command. This is the default now for |
---|
| 11 | +.Nm all |
---|
| 12 | +clients (ftp and pftp) due to security concerns using the PORT transfer mode. |
---|
| 13 | +The flag is kept for compatibility only and has no effect anymore. |
---|
| 14 | .It Fl i |
---|
| 15 | Turns off interactive prompting during multiple file transfers. |
---|
| 16 | .It Fl n |
---|
| 17 | diff -urN netkit-ftp-0.17-pre20000412/ftp/ftp.c netkit-ftp-0.17-pre20000412.new/ftp/ftp.c |
---|
| 18 | --- netkit-ftp-0.17-pre20000412/ftp/ftp.c Mon Dec 13 21:33:20 1999 |
---|
| 19 | +++ netkit-ftp-0.17-pre20000412.new/ftp/ftp.c Wed Aug 16 14:12:50 2000 |
---|
| 20 | @@ -883,7 +883,7 @@ |
---|
| 21 | } |
---|
| 22 | if (fstat(fileno(fout), &st) < 0 || st.st_blksize == 0) |
---|
| 23 | st.st_blksize = BUFSIZ; |
---|
| 24 | - if (st.st_blksize > bufsize) { |
---|
| 25 | + if ((unsigned)st.st_blksize > bufsize) { |
---|
| 26 | if (buf) |
---|
| 27 | (void) free(buf); |
---|
| 28 | buf = malloc((unsigned)st.st_blksize); |
---|
| 29 | diff -urN netkit-ftp-0.17-pre20000412/ftp/main.c netkit-ftp-0.17-pre20000412.new/ftp/main.c |
---|
| 30 | --- netkit-ftp-0.17-pre20000412/ftp/main.c Sat Oct 2 15:25:23 1999 |
---|
| 31 | +++ netkit-ftp-0.17-pre20000412.new/ftp/main.c Wed Aug 16 13:58:57 2000 |
---|
| 32 | @@ -87,7 +87,7 @@ |
---|
| 33 | usage(void) |
---|
| 34 | { |
---|
| 35 | printf("\n\tUsage: { ftp | pftp } [-pinegvtd] [hostname]\n"); |
---|
| 36 | - printf("\t -p: enable passive mode (default for pftp)\n"); |
---|
| 37 | + printf("\t -p: enable passive mode (default for ftp and pftp)\n"); |
---|
| 38 | printf("\t -i: turn off prompting during mget\n"); |
---|
| 39 | printf("\t -n: inhibit auto-login\n"); |
---|
| 40 | printf("\t -e: disable readline support, if present\n"); |
---|
| 41 | @@ -118,7 +118,7 @@ |
---|
| 42 | doglob = 1; |
---|
| 43 | interactive = 1; |
---|
| 44 | autologin = 1; |
---|
| 45 | - passivemode = 0; |
---|
| 46 | + passivemode = 1; |
---|
| 47 | |
---|
| 48 | cp = strrchr(argv[0], '/'); |
---|
| 49 | cp = (cp == NULL) ? argv[0] : cp+1; |
---|