diff options
| author | Damien Miller <djm@mindrot.org> | 1999-11-11 17:57:39 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-11-11 17:57:39 +1100 |
| commit | 5ce662a9202240a2f5fa6a9334d58186bdaba50c (patch) | |
| tree | 9fe37122fa27f070abc3c9c28531877d43673b7f /clientloop.c | |
| parent | ab5e0d0c27e00dca463c67395c2b5941e778836e (diff) | |
- Merged more OpenBSD CVS changes:
- [auth-krb4.c auth-passwd.c] remove x11- and krb-cleanup from fatal()
+ krb-cleanup cleanup
- [clientloop.c log-client.c log-server.c ]
[readconf.c readconf.h servconf.c servconf.h ]
[ssh.1 ssh.c ssh.h sshd.8]
add LogLevel {QUIET, FATAL, ERROR, INFO, CHAT, DEBUG} to ssh/sshd,
obsoletes QuietMode and FascistLogging in sshd.
Diffstat (limited to 'clientloop.c')
| -rw-r--r-- | clientloop.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clientloop.c b/clientloop.c index 43373b72..a236ce9b 100644 --- a/clientloop.c +++ b/clientloop.c @@ -15,16 +15,17 @@ The main loop for the interactive session (client side). */ #include "includes.h" -RCSID("$Id: clientloop.c,v 1.1 1999/10/27 03:42:44 damien Exp $"); +RCSID("$Id: clientloop.c,v 1.2 1999/11/11 06:57:39 damien Exp $"); #include "xmalloc.h" #include "ssh.h" #include "packet.h" #include "buffer.h" #include "authfd.h" +#include "readconf.h" /* Flag indicating whether quiet mode is on. */ -extern int quiet_flag; +extern Options options; /* Flag indicating that stdin should be redirected from /dev/null. */ extern int stdin_null_flag; @@ -866,7 +867,7 @@ int client_loop(int have_pty, int escape_char_arg) /* In interactive mode (with pseudo tty) display a message indicating that the connection has been closed. */ - if (have_pty && !quiet_flag) + if (have_pty && options.log_level != SYSLOG_LEVEL_QUIET) { snprintf(buf, sizeof buf, "Connection to %.64s closed.\r\n", host); buffer_append(&stderr_buffer, buf, strlen(buf)); |