oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

s/timeout/ftpd_timeout/

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@628 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1996-08-04 23:04:05 +00:00
parent 7be7eef4c4
commit 8afe88fd78
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
appl/ftp/ftpd/ftpcmd.y
View File

@@ -503,7 +503,7 @@ cmd
{ {
reply(200, reply(200,
"Current IDLE time limit is %d seconds; max %d", "Current IDLE time limit is %d seconds; max %d",
timeout, maxtimeout); ftpd_timeout, maxtimeout);
} }
| SITE SP IDLE SP NUMBER CRLF | SITE SP IDLE SP NUMBER CRLF
{ {
@@ -512,11 +512,11 @@ cmd
"Maximum IDLE time must be between 30 and %d seconds", "Maximum IDLE time must be between 30 and %d seconds",
maxtimeout); maxtimeout);
} else { } else {
timeout = $5; ftpd_timeout = $5;
(void) alarm((unsigned) timeout); (void) alarm((unsigned) ftpd_timeout);
reply(200, reply(200,
"Maximum IDLE time set to %d seconds", "Maximum IDLE time set to %d seconds",
timeout); ftpd_timeout);
} }
} }
@@ -1008,10 +1008,11 @@ toolong(int signo)
{ {
reply(421, reply(421,
"Timeout (%d seconds): closing control connection.", timeout); "Timeout (%d seconds): closing control connection.",
ftpd_timeout);
if (logging) if (logging)
syslog(LOG_INFO, "User %s timed out after %d seconds", syslog(LOG_INFO, "User %s timed out after %d seconds",
(pw ? pw -> pw_name : "unknown"), timeout); (pw ? pw -> pw_name : "unknown"), ftpd_timeout);
dologout(1); dologout(1);
} }
@@ -1029,7 +1030,7 @@ yylex(void)
case CMD: case CMD:
(void) signal(SIGALRM, toolong); (void) signal(SIGALRM, toolong);
(void) alarm((unsigned) timeout); (void) alarm((unsigned) ftpd_timeout);
if (getline(cbuf, sizeof(cbuf)-1) == NULL) { if (getline(cbuf, sizeof(cbuf)-1) == NULL) {
reply(221, "You could at least say goodbye."); reply(221, "You could at least say goodbye.");
dologout(0); dologout(0);