diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.c | 12 |
2 files changed, 10 insertions, 7 deletions
@@ -58,6 +58,9 @@ | |||
58 | [clientloop.c serverloop.c] | 58 | [clientloop.c serverloop.c] |
59 | don't memset too much memory, ok millert@ | 59 | don't memset too much memory, ok millert@ |
60 | original patch from jlk@kamens.brookline.ma.us via nalin@redhat.com | 60 | original patch from jlk@kamens.brookline.ma.us via nalin@redhat.com |
61 | - markus@cvs.openbsd.org 2001/11/10 13:19:45 | ||
62 | [sshd.c] | ||
63 | cleanup libwrap support (remove bogus comment, bogus close(), add debug, etc). | ||
61 | 64 | ||
62 | 20011109 | 65 | 20011109 |
63 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) | 66 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) |
@@ -6870,4 +6873,4 @@ | |||
6870 | - Wrote replacements for strlcpy and mkdtemp | 6873 | - Wrote replacements for strlcpy and mkdtemp |
6871 | - Released 1.0pre1 | 6874 | - Released 1.0pre1 |
6872 | 6875 | ||
6873 | $Id: ChangeLog,v 1.1652 2001/11/12 00:06:54 djm Exp $ | 6876 | $Id: ChangeLog,v 1.1653 2001/11/12 00:07:11 djm Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.208 2001/11/09 19:08:35 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.209 2001/11/10 13:19:45 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -1134,9 +1134,8 @@ main(int ac, char **av) | |||
1134 | remote_port = get_remote_port(); | 1134 | remote_port = get_remote_port(); |
1135 | remote_ip = get_remote_ipaddr(); | 1135 | remote_ip = get_remote_ipaddr(); |
1136 | 1136 | ||
1137 | /* Check whether logins are denied from this host. */ | ||
1138 | #ifdef LIBWRAP | 1137 | #ifdef LIBWRAP |
1139 | /* XXX LIBWRAP noes not know about IPv6 */ | 1138 | /* Check whether logins are denied from this host. */ |
1140 | { | 1139 | { |
1141 | struct request_info req; | 1140 | struct request_info req; |
1142 | 1141 | ||
@@ -1144,13 +1143,14 @@ main(int ac, char **av) | |||
1144 | fromhost(&req); | 1143 | fromhost(&req); |
1145 | 1144 | ||
1146 | if (!hosts_access(&req)) { | 1145 | if (!hosts_access(&req)) { |
1146 | debug("Connection refused by tcp wrapper"); | ||
1147 | refuse(&req); | 1147 | refuse(&req); |
1148 | close(sock_in); | 1148 | /* NOTREACHED */ |
1149 | close(sock_out); | 1149 | fatal("libwrap refuse returns"); |
1150 | } | 1150 | } |
1151 | /*XXX IPv6 verbose("Connection from %.500s port %d", eval_client(&req), remote_port); */ | ||
1152 | } | 1151 | } |
1153 | #endif /* LIBWRAP */ | 1152 | #endif /* LIBWRAP */ |
1153 | |||
1154 | /* Log the connection. */ | 1154 | /* Log the connection. */ |
1155 | verbose("Connection from %.500s port %d", remote_ip, remote_port); | 1155 | verbose("Connection from %.500s port %d", remote_ip, remote_port); |
1156 | 1156 | ||