From b72aac9421d003f3e9e17ab1c0b5f84ce7c36a42 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 4 Aug 1996 22:39:33 +0000
Subject: [PATCH] s/timeout/ftpd_timeout/

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@624 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftpd/extern.h |  2 +-
 appl/ftp/ftpd/ftpd.c   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/appl/ftp/ftpd/extern.h b/appl/ftp/ftpd/extern.h
index b53aa18bd..c1d2529bd 100644
--- a/appl/ftp/ftpd/extern.h
+++ b/appl/ftp/ftpd/extern.h
@@ -97,7 +97,7 @@ extern jmp_buf urgcatch;
 
 extern	int form;
 extern	int debug;
-extern	int timeout;
+extern	int ftpd_timeout;
 extern	int maxtimeout;
 extern  int pdata;
 extern	char hostname[], remotehost[];
diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
index 5c191a51e..a83708a85 100644
--- a/appl/ftp/ftpd/ftpd.c
+++ b/appl/ftp/ftpd/ftpd.c
@@ -123,7 +123,7 @@ int	oobflag;
 int	logged_in;
 struct	passwd *pw;
 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	logging;
 int	guest;
@@ -310,15 +310,15 @@ main(int argc, char **argv, char **envp)
 		    break;
 		    
 		case 't':
-			timeout = atoi(optarg);
-			if (maxtimeout < timeout)
-				maxtimeout = timeout;
+			ftpd_timeout = atoi(optarg);
+			if (maxtimeout < ftpd_timeout)
+				maxtimeout = ftpd_timeout;
 			break;
 
 		case 'T':
 			maxtimeout = atoi(optarg);
-			if (timeout > maxtimeout)
-				timeout = maxtimeout;
+			if (ftpd_timeout > maxtimeout)
+				ftpd_timeout = maxtimeout;
 			break;
 
 		case 'u':