summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sshd.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4367699d2..2e5b94c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
3 - djm@cvs.openbsd.org 2004/06/24 19:30:54 3 - djm@cvs.openbsd.org 2004/06/24 19:30:54
4 [servconf.c servconf.h sshd.c] 4 [servconf.c servconf.h sshd.c]
5 re-exec sshd on accept(); initial work, final debugging and ok markus@ 5 re-exec sshd on accept(); initial work, final debugging and ok markus@
6 - djm@cvs.openbsd.org 2004/06/25 01:16:09
7 [sshd.c]
8 only perform tcp wrappers checks when the incoming connection is on a
9 socket. silences useless warnings from regress tests that use
10 proxycommand="sshd -i". prompted by david@ ok markus@
6 11
720040623 1220040623
8 - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1 13 - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
@@ -1405,4 +1410,4 @@
1405 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1410 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1406 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1411 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1407 1412
1408$Id: ChangeLog,v 1.3444 2004/06/25 03:33:20 dtucker Exp $ 1413$Id: ChangeLog,v 1.3445 2004/06/25 03:34:31 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index 98e90b5ac..2408fcb5a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.294 2004/06/24 19:30:54 djm Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.295 2004/06/25 01:16:09 djm Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -1620,7 +1620,7 @@ main(int ac, char **av)
1620 1620
1621#ifdef LIBWRAP 1621#ifdef LIBWRAP
1622 /* Check whether logins are denied from this host. */ 1622 /* Check whether logins are denied from this host. */
1623 { 1623 if (packet_connection_is_on_socket()) {
1624 struct request_info req; 1624 struct request_info req;
1625 1625
1626 request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0); 1626 request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0);