- markus@cvs.openbsd.org 2001/01/28 10:37:26

     [sshd.c]
     remove -Q, no longer needed

2 files changed, 17 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 82787983c..905b87382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,20 @@
 20010128
  - (bal) Put USE_PIPES back into sco3.2v5
  - (bal) OpenBSD Sync
-   - niklas@cvs.openbsd.org 2001/01/2001
+   - markus@cvs.openbsd.org 2001/01/28 10:15:34
+     [dispatch.c]
+     re-keying is not supported; ok deraadt@
+   - markus@cvs.openbsd.org 2001/01/28 10:37:26
+     [sshd.c]
+     remove -Q, no longer needed
+   - stevesk@cvs.openbsd.org 2001/01/28 20:36:16
+     [readconf.c]
+     ``StrictHostKeyChecking ask'' documentation and small cleanup.
+     ok markus@
+   - stevesk@cvs.openbsd.org 2001/01/28 22:27:05
+     [authfile.c]
+     spelling.  use sizeof vs. strlen().  ok markus@
+   - niklas@cvs.openbsd.org 2001/01/29 1:59:14
      [atomicio.h canohost.h clientloop.h deattack.h dh.h dispatch.h
       groupaccess.c groupaccess.h hmac.h hostfile.h includes.h kex.h
       key.h log.h login.h match.h misc.h myproposal.h nchan.ms pathnames.h
@@ -9,16 +22,6 @@
       ssh-dss.h ssh-keygen.1 ssh-keyscan.1 ssh-rsa.h ssh1.h ssh_config
       sshconnect.h sshd_config tildexpand.h uidswap.h uuencode.h]
      $OpenBSD$
-   - stevesk@cvs.openbsd.org 2001/01/28 22:27:05
-     [authfile.c]
-     spelling.  use sizeof vs. strlen().  ok markus@
-   - markus@cvs.openbsd.org 2001/01/28 10:15:34
-     [dispatch.c]
-     re-keying is not supported; ok deraadt@
-   - stevesk@cvs.openbsd.or 2001/01/28 20:36:16
-     [readconf.c]
-     ``StrictHostKeyChecking ask'' documentation and small cleanup.
-     ok markus@
 
 20010126
  - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen 
diff --git a/sshd.c b/sshd.c
index 853553592..d46e4aa8b 100644
--- a/sshd.c
+++ b/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>
@@ -551,7 +551,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;
@@ -605,7 +604,7 @@ main(int ac, char **av)
                         inetd_flag = 1;
                         break;
                 case 'Q':
-                        silent = 1;
+                        /* ignored */
                         break;
                 case 'q':
                         options.log_level = SYSLOG_LEVEL_QUIET;
@@ -672,7 +671,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);
@@ -725,8 +724,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);
         }