diff options
-rw-r--r-- | ChangeLog | 25 | ||||
-rw-r--r-- | sshd.c | 9 |
2 files changed, 17 insertions, 17 deletions
@@ -1,7 +1,20 @@ | |||
1 | 20010128 | 1 | 20010128 |
2 | - (bal) Put USE_PIPES back into sco3.2v5 | 2 | - (bal) Put USE_PIPES back into sco3.2v5 |
3 | - (bal) OpenBSD Sync | 3 | - (bal) OpenBSD Sync |
4 | - niklas@cvs.openbsd.org 2001/01/2001 | 4 | - markus@cvs.openbsd.org 2001/01/28 10:15:34 |
5 | [dispatch.c] | ||
6 | re-keying is not supported; ok deraadt@ | ||
7 | - markus@cvs.openbsd.org 2001/01/28 10:37:26 | ||
8 | [sshd.c] | ||
9 | remove -Q, no longer needed | ||
10 | - stevesk@cvs.openbsd.org 2001/01/28 20:36:16 | ||
11 | [readconf.c] | ||
12 | ``StrictHostKeyChecking ask'' documentation and small cleanup. | ||
13 | ok markus@ | ||
14 | - stevesk@cvs.openbsd.org 2001/01/28 22:27:05 | ||
15 | [authfile.c] | ||
16 | spelling. use sizeof vs. strlen(). ok markus@ | ||
17 | - niklas@cvs.openbsd.org 2001/01/29 1:59:14 | ||
5 | [atomicio.h canohost.h clientloop.h deattack.h dh.h dispatch.h | 18 | [atomicio.h canohost.h clientloop.h deattack.h dh.h dispatch.h |
6 | groupaccess.c groupaccess.h hmac.h hostfile.h includes.h kex.h | 19 | groupaccess.c groupaccess.h hmac.h hostfile.h includes.h kex.h |
7 | key.h log.h login.h match.h misc.h myproposal.h nchan.ms pathnames.h | 20 | key.h log.h login.h match.h misc.h myproposal.h nchan.ms pathnames.h |
@@ -9,16 +22,6 @@ | |||
9 | ssh-dss.h ssh-keygen.1 ssh-keyscan.1 ssh-rsa.h ssh1.h ssh_config | 22 | ssh-dss.h ssh-keygen.1 ssh-keyscan.1 ssh-rsa.h ssh1.h ssh_config |
10 | sshconnect.h sshd_config tildexpand.h uidswap.h uuencode.h] | 23 | sshconnect.h sshd_config tildexpand.h uidswap.h uuencode.h] |
11 | $OpenBSD$ | 24 | $OpenBSD$ |
12 | - stevesk@cvs.openbsd.org 2001/01/28 22:27:05 | ||
13 | [authfile.c] | ||
14 | spelling. use sizeof vs. strlen(). ok markus@ | ||
15 | - markus@cvs.openbsd.org 2001/01/28 10:15:34 | ||
16 | [dispatch.c] | ||
17 | re-keying is not supported; ok deraadt@ | ||
18 | - stevesk@cvs.openbsd.or 2001/01/28 20:36:16 | ||
19 | [readconf.c] | ||
20 | ``StrictHostKeyChecking ask'' documentation and small cleanup. | ||
21 | ok markus@ | ||
22 | 25 | ||
23 | 20010126 | 26 | 20010126 |
24 | - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen | 27 | - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.157 2001/01/22 23:06:40 markus Exp $"); | 43 | RCSID("$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 | } |