View | Details | Raw Unified | Return to bug 1427 | Differences between
and this patch

Collapse All | Expand All

(-)clientloop.c (-1 / +1 lines)
Lines 1591-1597 Link Here
1591
         * In interactive mode (with pseudo tty) display a message indicating
1591
         * In interactive mode (with pseudo tty) display a message indicating
1592
         * that the connection has been closed.
1592
         * that the connection has been closed.
1593
         */
1593
         */
1594
        if (have_pty && options.log_level != SYSLOG_LEVEL_QUIET) {
1594
        if (have_pty && options.log_level > SYSLOG_LEVEL_QUIET) {
1595
                snprintf(buf, sizeof buf, "Connection to %.64s closed.\r\n", host);
1595
                snprintf(buf, sizeof buf, "Connection to %.64s closed.\r\n", host);
1596
                buffer_append(&stderr_buffer, buf, strlen(buf));
1596
                buffer_append(&stderr_buffer, buf, strlen(buf));
1597
        }
1597
        }
(-)log.c (-1 / +1 lines)
Lines 222-228 Link Here
222
        argv0 = av0;
222
        argv0 = av0;
223
223
224
        switch (level) {
224
        switch (level) {
225
        case SYSLOG_LEVEL_QUIET:
225
        case SYSLOG_LEVEL_NONE:
226
        case SYSLOG_LEVEL_FATAL:
226
        case SYSLOG_LEVEL_FATAL:
227
        case SYSLOG_LEVEL_ERROR:
227
        case SYSLOG_LEVEL_ERROR:
228
        case SYSLOG_LEVEL_INFO:
228
        case SYSLOG_LEVEL_INFO:
(-)log.h (-2 / +3 lines)
Lines 35-41 Link Here
35
}       SyslogFacility;
35
}       SyslogFacility;
36
36
37
typedef enum {
37
typedef enum {
38
        SYSLOG_LEVEL_QUIET,
38
        SYSLOG_LEVEL_NONE,
39
        SYSLOG_LEVEL_FATAL,
39
        SYSLOG_LEVEL_FATAL,
40
        SYSLOG_LEVEL_ERROR,
40
        SYSLOG_LEVEL_ERROR,
41
        SYSLOG_LEVEL_INFO,
41
        SYSLOG_LEVEL_INFO,
Lines 43-49 Link Here
43
        SYSLOG_LEVEL_DEBUG1,
43
        SYSLOG_LEVEL_DEBUG1,
44
        SYSLOG_LEVEL_DEBUG2,
44
        SYSLOG_LEVEL_DEBUG2,
45
        SYSLOG_LEVEL_DEBUG3,
45
        SYSLOG_LEVEL_DEBUG3,
46
        SYSLOG_LEVEL_NOT_SET = -1
46
        SYSLOG_LEVEL_NOT_SET = -1,
47
        SYSLOG_LEVEL_QUIET = SYSLOG_LEVEL_FATAL
47
}       LogLevel;
48
}       LogLevel;
48
49
49
void     log_init(char *, LogLevel, SyslogFacility, int);
50
void     log_init(char *, LogLevel, SyslogFacility, int);
(-)scp.1 (-1 / +2 lines)
Lines 178-184 Link Here
178
Preserves modification times, access times, and modes from the
178
Preserves modification times, access times, and modes from the
179
original file.
179
original file.
180
.It Fl q
180
.It Fl q
181
Disables the progress meter.
181
Quiet mode.
182
Disables the progress meter and any other non-critical messages.
182
.It Fl r
183
.It Fl r
183
Recursively copy entire directories.
184
Recursively copy entire directories.
184
.It Fl S Ar program
185
.It Fl S Ar program
(-)ssh.1 (-1 / +1 lines)
Lines 506-512 Link Here
506
per-host basis in the configuration file.
506
per-host basis in the configuration file.
507
.It Fl q
507
.It Fl q
508
Quiet mode.
508
Quiet mode.
509
Causes all warning and diagnostic messages to be suppressed.
509
Disables any non-critical messages.
510
.It Fl R Xo
510
.It Fl R Xo
511
.Sm off
511
.Sm off
512
.Oo Ar bind_address : Oc
512
.Oo Ar bind_address : Oc

Return to bug 1427