summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sshd.c b/sshd.c
index 853553592..d46e4aa8b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.157 2001/01/22 23:06:40 markus Exp $"); 43RCSID("$OpenBSD: sshd.c,v 1.158 2001/01/28 10:37:26 markus Exp $");
44 44
45#include <openssl/dh.h> 45#include <openssl/dh.h>
46#include <openssl/bn.h> 46#include <openssl/bn.h>
@@ -551,7 +551,6 @@ main(int ac, char **av)
551 int opt, sock_in = 0, sock_out = 0, newsock, j, i, fdsetsz, on = 1; 551 int opt, sock_in = 0, sock_out = 0, newsock, j, i, fdsetsz, on = 1;
552 pid_t pid; 552 pid_t pid;
553 socklen_t fromlen; 553 socklen_t fromlen;
554 int silent = 0;
555 fd_set *fdset; 554 fd_set *fdset;
556 struct sockaddr_storage from; 555 struct sockaddr_storage from;
557 const char *remote_ip; 556 const char *remote_ip;
@@ -605,7 +604,7 @@ main(int ac, char **av)
605 inetd_flag = 1; 604 inetd_flag = 1;
606 break; 605 break;
607 case 'Q': 606 case 'Q':
608 silent = 1; 607 /* ignored */
609 break; 608 break;
610 case 'q': 609 case 'q':
611 options.log_level = SYSLOG_LEVEL_QUIET; 610 options.log_level = SYSLOG_LEVEL_QUIET;
@@ -672,7 +671,7 @@ main(int ac, char **av)
672 log_init(__progname, 671 log_init(__progname,
673 options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, 672 options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,
674 options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility, 673 options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility,
675 !silent && !inetd_flag); 674 !inetd_flag);
676 675
677 /* Read server configuration options from the configuration file. */ 676 /* Read server configuration options from the configuration file. */
678 read_server_config(&options, config_file_name); 677 read_server_config(&options, config_file_name);
@@ -725,8 +724,6 @@ main(int ac, char **av)
725 options.protocol &= ~SSH_PROTO_2; 724 options.protocol &= ~SSH_PROTO_2;
726 } 725 }
727 if (! options.protocol & (SSH_PROTO_1|SSH_PROTO_2)) { 726 if (! options.protocol & (SSH_PROTO_1|SSH_PROTO_2)) {
728 if (silent == 0)
729 fprintf(stderr, "sshd: no hostkeys available -- exiting.\n");
730 log("sshd: no hostkeys available -- exiting.\n"); 727 log("sshd: no hostkeys available -- exiting.\n");
731 exit(1); 728 exit(1);
732 } 729 }