s/timeout/ftpd_timeout/
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@624 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -97,7 +97,7 @@ extern jmp_buf urgcatch;
|
|||||||
|
|
||||||
extern int form;
|
extern int form;
|
||||||
extern int debug;
|
extern int debug;
|
||||||
extern int timeout;
|
extern int ftpd_timeout;
|
||||||
extern int maxtimeout;
|
extern int maxtimeout;
|
||||||
extern int pdata;
|
extern int pdata;
|
||||||
extern char hostname[], remotehost[];
|
extern char hostname[], remotehost[];
|
||||||
|
@@ -123,7 +123,7 @@ int oobflag;
|
|||||||
int logged_in;
|
int logged_in;
|
||||||
struct passwd *pw;
|
struct passwd *pw;
|
||||||
int debug;
|
int debug;
|
||||||
int timeout = 900; /* timeout after 15 minutes of inactivity */
|
int ftpd_timeout = 900; /* timeout after 15 minutes of inactivity */
|
||||||
int maxtimeout = 7200;/* don't allow idle time to be set beyond 2 hours */
|
int maxtimeout = 7200;/* don't allow idle time to be set beyond 2 hours */
|
||||||
int logging;
|
int logging;
|
||||||
int guest;
|
int guest;
|
||||||
@@ -310,15 +310,15 @@ main(int argc, char **argv, char **envp)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 't':
|
case 't':
|
||||||
timeout = atoi(optarg);
|
ftpd_timeout = atoi(optarg);
|
||||||
if (maxtimeout < timeout)
|
if (maxtimeout < ftpd_timeout)
|
||||||
maxtimeout = timeout;
|
maxtimeout = ftpd_timeout;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'T':
|
case 'T':
|
||||||
maxtimeout = atoi(optarg);
|
maxtimeout = atoi(optarg);
|
||||||
if (timeout > maxtimeout)
|
if (ftpd_timeout > maxtimeout)
|
||||||
timeout = maxtimeout;
|
ftpd_timeout = maxtimeout;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'u':
|
case 'u':
|
||||||
|
Reference in New Issue
Block a user