diff options
| -rw-r--r-- | usr.bin/ssh/sshd.8 | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8 index b7780e59e74..5aadeafe948 100644 --- a/usr.bin/ssh/sshd.8 +++ b/usr.bin/ssh/sshd.8 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.84 2001/01/28 10:24:04 markus Exp $ +.\" $OpenBSD: sshd.8,v 1.85 2001/01/28 10:37:25 markus Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -43,7 +43,7 @@ .Nd secure shell daemon .Sh SYNOPSIS .Nm sshd -.Op Fl diqDQ46 +.Op Fl diqD46 .Op Fl b Ar bits .Op Fl f Ar config_file .Op Fl g Ar login_grace_time @@ -262,8 +262,6 @@ When this option is specified will not detach and does not become a daemon. This allows easy monitoring of .Nm sshd . -.It Fl Q -Do not print an error message if RSA support is missing. .It Fl V Ar client_protocol_id SSH-2 compatibility mode. When this option is specified diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 12729eeb37a..d6ce689ba8d 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.157 2001/01/22 23:06:40 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.158 2001/01/28 10:37:26 markus Exp $"); #include <openssl/dh.h> #include <openssl/bn.h> @@ -542,7 +542,6 @@ main(int ac, char **av) int opt, sock_in = 0, sock_out = 0, newsock, j, i, fdsetsz, on = 1; pid_t pid; socklen_t fromlen; - int silent = 0; fd_set *fdset; struct sockaddr_storage from; const char *remote_ip; @@ -592,7 +591,7 @@ main(int ac, char **av) inetd_flag = 1; break; case 'Q': - silent = 1; + /* ignored */ break; case 'q': options.log_level = SYSLOG_LEVEL_QUIET; @@ -659,7 +658,7 @@ main(int ac, char **av) log_init(__progname, options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility, - !silent && !inetd_flag); + !inetd_flag); /* Read server configuration options from the configuration file. */ read_server_config(&options, config_file_name); @@ -712,8 +711,6 @@ main(int ac, char **av) options.protocol &= ~SSH_PROTO_2; } if (! options.protocol & (SSH_PROTO_1|SSH_PROTO_2)) { - if (silent == 0) - fprintf(stderr, "sshd: no hostkeys available -- exiting.\n"); log("sshd: no hostkeys available -- exiting.\n"); exit(1); } |