From 6d7b2cd1a32efa2a40c97361065d357a2e60b716 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 12 Nov 1999 15:19:27 +1100 Subject: - Merged yet more changes from OpenBSD CVS - [auth-rh-rsa.c auth-rhosts.c auth-rsa.c channels.c clientloop.c] [ssh.c ssh.h sshconnect.c sshd.c] make all access to options via 'extern Options options' and 'extern ServerOptions options' respectively; options are no longer passed as arguments: * make options handling more consistent * remove #include "readconf.h" from ssh.h * readconf.h is only included if necessary - [mpaux.c] clear temp buffer - [servconf.c] print _all_ bad options found in configfile --- clientloop.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'clientloop.c') diff --git a/clientloop.c b/clientloop.c index a236ce9b2..410dc54de 100644 --- a/clientloop.c +++ b/clientloop.c @@ -15,7 +15,7 @@ The main loop for the interactive session (client side). */ #include "includes.h" -RCSID("$Id: clientloop.c,v 1.2 1999/11/11 06:57:39 damien Exp $"); +RCSID("$Id: clientloop.c,v 1.3 1999/11/12 04:19:27 damien Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -24,9 +24,6 @@ RCSID("$Id: clientloop.c,v 1.2 1999/11/11 06:57:39 damien Exp $"); #include "authfd.h" #include "readconf.h" -/* Flag indicating whether quiet mode is on. */ -extern Options options; - /* Flag indicating that stdin should be redirected from /dev/null. */ extern int stdin_null_flag; @@ -764,6 +761,7 @@ void client_process_output(fd_set *writeset) int client_loop(int have_pty, int escape_char_arg) { + extern Options options; double start_time, total_time; int len; char buf[100]; -- cgit v1.2.3