diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-16 16:19:53 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-16 16:19:53 +0000 |
| commit | 20c82168976a511237b45eef94891e9124f47f7a (patch) | |
| tree | 034de657c181a5dbe623b9fc670cec637231b257 /include | |
| parent | f2160b6a09f4e4879fb718526106c548d8f8ec23 (diff) | |
| download | busybox-w32-20c82168976a511237b45eef94891e9124f47f7a.tar.gz busybox-w32-20c82168976a511237b45eef94891e9124f47f7a.tar.bz2 busybox-w32-20c82168976a511237b45eef94891e9124f47f7a.zip | |
ftpd: add idle and absolute timeouts. This is a security issue,
otherwise ftpd may end up hanging indefinitely.
function old new delta
timeout_handler - 110 +110
ftpd_main 2019 2115 +96
packed_usage 25662 25685 +23
handle_upload_common 306 322 +16
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 3/0 up/down: 245/0) Total: 245 bytes
Diffstat (limited to 'include')
| -rw-r--r-- | include/usage.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/usage.h b/include/usage.h index 25a716278..e78754315 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -1281,7 +1281,7 @@ | |||
| 1281 | "\n -f Force file system check" \ | 1281 | "\n -f Force file system check" \ |
| 1282 | 1282 | ||
| 1283 | #define ftpd_trivial_usage \ | 1283 | #define ftpd_trivial_usage \ |
| 1284 | "[-wvS] [DIR]" | 1284 | "[-wvS] [-t N] [-T N] [DIR]" |
| 1285 | #define ftpd_full_usage "\n\n" \ | 1285 | #define ftpd_full_usage "\n\n" \ |
| 1286 | "FTP server\n" \ | 1286 | "FTP server\n" \ |
| 1287 | "\n" \ | 1287 | "\n" \ |
| @@ -1294,6 +1294,7 @@ | |||
| 1294 | "\n -w Allow upload" \ | 1294 | "\n -w Allow upload" \ |
| 1295 | "\n -v Log to stderr" \ | 1295 | "\n -v Log to stderr" \ |
| 1296 | "\n -S Log to syslog" \ | 1296 | "\n -S Log to syslog" \ |
| 1297 | "\n -t,-T Idle and absolute timeouts" \ | ||
| 1297 | "\n DIR Change root to this directory" \ | 1298 | "\n DIR Change root to this directory" \ |
| 1298 | 1299 | ||
| 1299 | #define ftpget_trivial_usage \ | 1300 | #define ftpget_trivial_usage \ |
