diff options
Diffstat (limited to 'debian/patches/restore-tcp-wrappers.patch')
-rw-r--r-- | debian/patches/restore-tcp-wrappers.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/restore-tcp-wrappers.patch b/debian/patches/restore-tcp-wrappers.patch index fdc6cf18a..0472ea7d0 100644 --- a/debian/patches/restore-tcp-wrappers.patch +++ b/debian/patches/restore-tcp-wrappers.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 389e16d0109d8c49a761cd7c267438b05c9ab984 Mon Sep 17 00:00:00 2001 | 1 | From 0f9f44654708e4fde2f52c52f717d061b5e458fa Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Tue, 7 Oct 2014 13:22:41 +0100 | 3 | Date: Tue, 7 Oct 2014 13:22:41 +0100 |
4 | Subject: Restore TCP wrappers support | 4 | Subject: Restore TCP wrappers support |
@@ -18,7 +18,7 @@ but it at least probably doesn't involve dropping this feature shortly | |||
18 | before a freeze. | 18 | before a freeze. |
19 | 19 | ||
20 | Forwarded: not-needed | 20 | Forwarded: not-needed |
21 | Last-Update: 2018-08-24 | 21 | Last-Update: 2019-06-05 |
22 | 22 | ||
23 | Patch-Name: restore-tcp-wrappers.patch | 23 | Patch-Name: restore-tcp-wrappers.patch |
24 | --- | 24 | --- |
@@ -28,10 +28,10 @@ Patch-Name: restore-tcp-wrappers.patch | |||
28 | 3 files changed, 89 insertions(+) | 28 | 3 files changed, 89 insertions(+) |
29 | 29 | ||
30 | diff --git a/configure.ac b/configure.ac | 30 | diff --git a/configure.ac b/configure.ac |
31 | index 023e7cc55..917300b43 100644 | 31 | index 2869f7042..ce16e7758 100644 |
32 | --- a/configure.ac | 32 | --- a/configure.ac |
33 | +++ b/configure.ac | 33 | +++ b/configure.ac |
34 | @@ -1517,6 +1517,62 @@ else | 34 | @@ -1518,6 +1518,62 @@ else |
35 | AC_MSG_RESULT([no]) | 35 | AC_MSG_RESULT([no]) |
36 | fi | 36 | fi |
37 | 37 | ||
@@ -94,7 +94,7 @@ index 023e7cc55..917300b43 100644 | |||
94 | # Check whether user wants to use ldns | 94 | # Check whether user wants to use ldns |
95 | LDNS_MSG="no" | 95 | LDNS_MSG="no" |
96 | AC_ARG_WITH(ldns, | 96 | AC_ARG_WITH(ldns, |
97 | @@ -5329,6 +5385,7 @@ echo " PAM support: $PAM_MSG" | 97 | @@ -5269,6 +5325,7 @@ echo " PAM support: $PAM_MSG" |
98 | echo " OSF SIA support: $SIA_MSG" | 98 | echo " OSF SIA support: $SIA_MSG" |
99 | echo " KerberosV support: $KRB5_MSG" | 99 | echo " KerberosV support: $KRB5_MSG" |
100 | echo " SELinux support: $SELINUX_MSG" | 100 | echo " SELinux support: $SELINUX_MSG" |
@@ -128,7 +128,7 @@ index fb133c14b..57a7fd66b 100644 | |||
128 | .Xr moduli 5 , | 128 | .Xr moduli 5 , |
129 | .Xr sshd_config 5 , | 129 | .Xr sshd_config 5 , |
130 | diff --git a/sshd.c b/sshd.c | 130 | diff --git a/sshd.c b/sshd.c |
131 | index 539a000fd..673db87f6 100644 | 131 | index 98680721b..46870d3b5 100644 |
132 | --- a/sshd.c | 132 | --- a/sshd.c |
133 | +++ b/sshd.c | 133 | +++ b/sshd.c |
134 | @@ -127,6 +127,13 @@ | 134 | @@ -127,6 +127,13 @@ |
@@ -145,7 +145,7 @@ index 539a000fd..673db87f6 100644 | |||
145 | /* Re-exec fds */ | 145 | /* Re-exec fds */ |
146 | #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) | 146 | #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) |
147 | #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2) | 147 | #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2) |
148 | @@ -2099,6 +2106,24 @@ main(int ac, char **av) | 148 | @@ -2057,6 +2064,24 @@ main(int ac, char **av) |
149 | #ifdef SSH_AUDIT_EVENTS | 149 | #ifdef SSH_AUDIT_EVENTS |
150 | audit_connection_from(remote_ip, remote_port); | 150 | audit_connection_from(remote_ip, remote_port); |
151 | #endif | 151 | #endif |
@@ -153,7 +153,7 @@ index 539a000fd..673db87f6 100644 | |||
153 | + allow_severity = options.log_facility|LOG_INFO; | 153 | + allow_severity = options.log_facility|LOG_INFO; |
154 | + deny_severity = options.log_facility|LOG_WARNING; | 154 | + deny_severity = options.log_facility|LOG_WARNING; |
155 | + /* Check whether logins are denied from this host. */ | 155 | + /* Check whether logins are denied from this host. */ |
156 | + if (packet_connection_is_on_socket()) { | 156 | + if (ssh_packet_connection_is_on_socket(ssh)) { |
157 | + struct request_info req; | 157 | + struct request_info req; |
158 | + | 158 | + |
159 | + request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0); | 159 | + request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0); |