summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/sshd.c b/sshd.c
index 045f14941..0ade55771 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.422 2014/03/27 23:01:27 markus Exp $ */ 1/* $OpenBSD: sshd.c,v 1.421 2014/03/26 19:58:37 tedu Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -122,13 +122,6 @@
122#include "ssh-sandbox.h" 122#include "ssh-sandbox.h"
123#include "version.h" 123#include "version.h"
124 124
125#ifdef LIBWRAP
126#include <tcpd.h>
127#include <syslog.h>
128int allow_severity;
129int deny_severity;
130#endif /* LIBWRAP */
131
132#ifndef O_NOCTTY 125#ifndef O_NOCTTY
133#define O_NOCTTY 0 126#define O_NOCTTY 0
134#endif 127#endif
@@ -2034,24 +2027,6 @@ main(int ac, char **av)
2034#ifdef SSH_AUDIT_EVENTS 2027#ifdef SSH_AUDIT_EVENTS
2035 audit_connection_from(remote_ip, remote_port); 2028 audit_connection_from(remote_ip, remote_port);
2036#endif 2029#endif
2037#ifdef LIBWRAP
2038 allow_severity = options.log_facility|LOG_INFO;
2039 deny_severity = options.log_facility|LOG_WARNING;
2040 /* Check whether logins are denied from this host. */
2041 if (packet_connection_is_on_socket()) {
2042 struct request_info req;
2043
2044 request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0);
2045 fromhost(&req);
2046
2047 if (!hosts_access(&req)) {
2048 debug("Connection refused by tcp wrapper");
2049 refuse(&req);
2050 /* NOTREACHED */
2051 fatal("libwrap refuse returns");
2052 }
2053 }
2054#endif /* LIBWRAP */
2055 2030
2056 /* Log the connection. */ 2031 /* Log the connection. */
2057 verbose("Connection from %s port %d on %s port %d", 2032 verbose("Connection from %s port %d on %s port %d",