- djm@cvs.openbsd.org 2004/06/25 01:16:09

     [sshd.c]
     only perform tcp wrappers checks when the incoming connection is on a
     socket.  silences useless warnings from regress tests that use
     proxycommand="sshd -i".  prompted by david@ ok markus@

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 @@
    - djm@cvs.openbsd.org 2004/06/24 19:30:54
      [servconf.c servconf.h sshd.c]
      re-exec sshd on accept(); initial work, final debugging and ok markus@
+   - djm@cvs.openbsd.org 2004/06/25 01:16:09
+     [sshd.c]
+     only perform tcp wrappers checks when the incoming connection is on a
+     socket.  silences useless warnings from regress tests that use
+     proxycommand="sshd -i".  prompted by david@ ok markus@
 
 20040623
  - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
@@ -1405,4 +1410,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3444 2004/06/25 03:33:20 dtucker Exp $
+$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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.294 2004/06/24 19:30:54 djm Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.295 2004/06/25 01:16:09 djm Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -1620,7 +1620,7 @@ main(int ac, char **av)
 
 #ifdef LIBWRAP
         /* Check whether logins are denied from this host. */
-        {
+        if (packet_connection_is_on_socket()) {
                 struct request_info req;
 
                 request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0);