diff options
author | Colin Watson <cjwatson@debian.org> | 2007-06-13 00:18:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-06-13 00:18:25 +0000 |
commit | 58c1210f4b0d85eec0f7df539643ac3c705862fc (patch) | |
tree | 7aee5204e60fde616ab7b5a9f06e6af168a701ec /ssh.c | |
parent | a31dd2449bd885d5763c2857eb4cac2794cf7ba9 (diff) |
* Suppress "Connection to <host> closed" and "Connection to master closed"
messages at loglevel SILENT (thanks, Jaap Eldering; closes: #409788).
* Suppress "Pseudo-terminal will not be allocated because stdin is not a
terminal" message at loglevels QUIET and SILENT (closes: #366814).
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -602,7 +602,7 @@ main(int ac, char **av) | |||
602 | tty_flag = 0; | 602 | tty_flag = 0; |
603 | /* Do not allocate a tty if stdin is not a tty. */ | 603 | /* Do not allocate a tty if stdin is not a tty. */ |
604 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { | 604 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { |
605 | if (tty_flag) | 605 | if (tty_flag && options.log_level > SYSLOG_LEVEL_QUIET) |
606 | logit("Pseudo-terminal will not be allocated because stdin is not a terminal."); | 606 | logit("Pseudo-terminal will not be allocated because stdin is not a terminal."); |
607 | tty_flag = 0; | 607 | tty_flag = 0; |
608 | } | 608 | } |
@@ -1485,7 +1485,7 @@ control_client(const char *path) | |||
1485 | 1485 | ||
1486 | leave_raw_mode(); | 1486 | leave_raw_mode(); |
1487 | 1487 | ||
1488 | if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) | 1488 | if (tty_flag && options.log_level > SYSLOG_LEVEL_QUIET) |
1489 | fprintf(stderr, "Connection to master closed.\r\n"); | 1489 | fprintf(stderr, "Connection to master closed.\r\n"); |
1490 | 1490 | ||
1491 | exit(exitval); | 1491 | exit(exitval); |