diff options
Diffstat (limited to 'debian/patches/syslog-level-silent.patch')
-rw-r--r-- | debian/patches/syslog-level-silent.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch index 04ea64d34..3ed46c8f8 100644 --- a/debian/patches/syslog-level-silent.patch +++ b/debian/patches/syslog-level-silent.patch | |||
@@ -18,7 +18,7 @@ Index: b/clientloop.c | |||
18 | =================================================================== | 18 | =================================================================== |
19 | --- a/clientloop.c | 19 | --- a/clientloop.c |
20 | +++ b/clientloop.c | 20 | +++ b/clientloop.c |
21 | @@ -1533,7 +1533,7 @@ | 21 | @@ -1536,7 +1536,7 @@ |
22 | * In interactive mode (with pseudo tty) display a message indicating | 22 | * In interactive mode (with pseudo tty) display a message indicating |
23 | * that the connection has been closed. | 23 | * that the connection has been closed. |
24 | */ | 24 | */ |
@@ -63,20 +63,20 @@ Index: b/mux.c | |||
63 | =================================================================== | 63 | =================================================================== |
64 | --- a/mux.c | 64 | --- a/mux.c |
65 | +++ b/mux.c | 65 | +++ b/mux.c |
66 | @@ -721,7 +721,7 @@ | 66 | @@ -1553,7 +1553,7 @@ |
67 | } else | 67 | } else |
68 | debug2("Received exit status from master %d", exitval[0]); | 68 | debug2("Received exit status from master %d", exitval); |
69 | 69 | ||
70 | - if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) | 70 | - if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) |
71 | + if (tty_flag && options.log_level > SYSLOG_LEVEL_QUIET) | 71 | + if (tty_flag && options.log_level > SYSLOG_LEVEL_QUIET) |
72 | fprintf(stderr, "Shared connection to %s closed.\r\n", host); | 72 | fprintf(stderr, "Shared connection to %s closed.\r\n", host); |
73 | 73 | ||
74 | exit(exitval[0]); | 74 | exit(exitval); |
75 | Index: b/sftp-server.8 | 75 | Index: b/sftp-server.8 |
76 | =================================================================== | 76 | =================================================================== |
77 | --- a/sftp-server.8 | 77 | --- a/sftp-server.8 |
78 | +++ b/sftp-server.8 | 78 | +++ b/sftp-server.8 |
79 | @@ -64,7 +64,7 @@ | 79 | @@ -74,7 +74,7 @@ |
80 | Specifies which messages will be logged by | 80 | Specifies which messages will be logged by |
81 | .Nm . | 81 | .Nm . |
82 | The possible values are: | 82 | The possible values are: |
@@ -89,7 +89,7 @@ Index: b/ssh.1 | |||
89 | =================================================================== | 89 | =================================================================== |
90 | --- a/ssh.1 | 90 | --- a/ssh.1 |
91 | +++ b/ssh.1 | 91 | +++ b/ssh.1 |
92 | @@ -500,6 +500,11 @@ | 92 | @@ -504,6 +504,11 @@ |
93 | .It Fl q | 93 | .It Fl q |
94 | Quiet mode. | 94 | Quiet mode. |
95 | Causes most warning and diagnostic messages to be suppressed. | 95 | Causes most warning and diagnostic messages to be suppressed. |
@@ -105,8 +105,8 @@ Index: b/ssh.c | |||
105 | =================================================================== | 105 | =================================================================== |
106 | --- a/ssh.c | 106 | --- a/ssh.c |
107 | +++ b/ssh.c | 107 | +++ b/ssh.c |
108 | @@ -389,7 +389,12 @@ | 108 | @@ -421,7 +421,12 @@ |
109 | } | 109 | options.exit_on_forward_failure = 1; |
110 | break; | 110 | break; |
111 | case 'q': | 111 | case 'q': |
112 | - options.log_level = SYSLOG_LEVEL_QUIET; | 112 | - options.log_level = SYSLOG_LEVEL_QUIET; |
@@ -119,7 +119,7 @@ Index: b/ssh.c | |||
119 | break; | 119 | break; |
120 | case 'e': | 120 | case 'e': |
121 | if (optarg[0] == '^' && optarg[2] == 0 && | 121 | if (optarg[0] == '^' && optarg[2] == 0 && |
122 | @@ -592,7 +597,7 @@ | 122 | @@ -624,7 +629,7 @@ |
123 | tty_flag = 0; | 123 | tty_flag = 0; |
124 | /* Do not allocate a tty if stdin is not a tty. */ | 124 | /* Do not allocate a tty if stdin is not a tty. */ |
125 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { | 125 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { |
@@ -132,7 +132,7 @@ Index: b/ssh_config.5 | |||
132 | =================================================================== | 132 | =================================================================== |
133 | --- a/ssh_config.5 | 133 | --- a/ssh_config.5 |
134 | +++ b/ssh_config.5 | 134 | +++ b/ssh_config.5 |
135 | @@ -685,7 +685,7 @@ | 135 | @@ -698,7 +698,7 @@ |
136 | Gives the verbosity level that is used when logging messages from | 136 | Gives the verbosity level that is used when logging messages from |
137 | .Xr ssh 1 . | 137 | .Xr ssh 1 . |
138 | The possible values are: | 138 | The possible values are: |
@@ -145,7 +145,7 @@ Index: b/sshd.8 | |||
145 | =================================================================== | 145 | =================================================================== |
146 | --- a/sshd.8 | 146 | --- a/sshd.8 |
147 | +++ b/sshd.8 | 147 | +++ b/sshd.8 |
148 | @@ -207,9 +207,12 @@ | 148 | @@ -217,9 +217,12 @@ |
149 | option override command-line ports. | 149 | option override command-line ports. |
150 | .It Fl q | 150 | .It Fl q |
151 | Quiet mode. | 151 | Quiet mode. |
@@ -163,7 +163,7 @@ Index: b/sshd.c | |||
163 | =================================================================== | 163 | =================================================================== |
164 | --- a/sshd.c | 164 | --- a/sshd.c |
165 | +++ b/sshd.c | 165 | +++ b/sshd.c |
166 | @@ -1355,7 +1355,12 @@ | 166 | @@ -1370,7 +1370,12 @@ |
167 | /* ignored */ | 167 | /* ignored */ |
168 | break; | 168 | break; |
169 | case 'q': | 169 | case 'q': |
@@ -181,7 +181,7 @@ Index: b/sshd_config.5 | |||
181 | =================================================================== | 181 | =================================================================== |
182 | --- a/sshd_config.5 | 182 | --- a/sshd_config.5 |
183 | +++ b/sshd_config.5 | 183 | +++ b/sshd_config.5 |
184 | @@ -567,7 +567,7 @@ | 184 | @@ -575,7 +575,7 @@ |
185 | Gives the verbosity level that is used when logging messages from | 185 | Gives the verbosity level that is used when logging messages from |
186 | .Xr sshd 8 . | 186 | .Xr sshd 8 . |
187 | The possible values are: | 187 | The possible values are: |