diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-27 08:42:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-27 08:42:40 +0000 |
| commit | 61ddb5002596ce4bfc6a400fd9952b514350c95a (patch) | |
| tree | b3c2223bb28ef51f8c683867e440500ef781e20d /debian/patches/restore-tcp-wrappers.patch | |
| parent | Merging upstream version 1:9.9p1. (diff) | |
| download | openssh-61ddb5002596ce4bfc6a400fd9952b514350c95a.tar.xz openssh-61ddb5002596ce4bfc6a400fd9952b514350c95a.zip | |
Adding debian version 1:9.9p1-1.debian/1%9.9p1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/restore-tcp-wrappers.patch')
| -rw-r--r-- | debian/patches/restore-tcp-wrappers.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches/restore-tcp-wrappers.patch b/debian/patches/restore-tcp-wrappers.patch index fdd3c61..b4a8543 100644 --- a/debian/patches/restore-tcp-wrappers.patch +++ b/debian/patches/restore-tcp-wrappers.patch @@ -1,4 +1,4 @@ -From 0ff8d4f5356adbdebdbdbf951713d22b1e8e264e Mon Sep 17 00:00:00 2001 +From 20df52e18eb28e8e50e475d85bb652e8fdc5f588 Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwatson@debian.org> Date: Tue, 7 Oct 2014 13:22:41 +0100 Subject: Restore TCP wrappers support @@ -28,10 +28,10 @@ Patch-Name: restore-tcp-wrappers.patch 3 files changed, 89 insertions(+) diff --git a/configure.ac b/configure.ac -index dc274329f..f6bca2631 100644 +index 6a0140a9d..90548dcfc 100644 --- a/configure.ac +++ b/configure.ac -@@ -1686,6 +1686,62 @@ else +@@ -1693,6 +1693,62 @@ else AC_MSG_RESULT([no]) fi @@ -94,7 +94,7 @@ index dc274329f..f6bca2631 100644 # Check whether user wants to use ldns LDNS_MSG="no" AC_ARG_WITH(ldns, -@@ -5723,6 +5779,7 @@ echo " PAM support: $PAM_MSG" +@@ -5734,6 +5790,7 @@ echo " PAM support: $PAM_MSG" echo " OSF SIA support: $SIA_MSG" echo " KerberosV support: $KRB5_MSG" echo " SELinux support: $SELINUX_MSG" @@ -103,7 +103,7 @@ index dc274329f..f6bca2631 100644 echo " libldns support: $LDNS_MSG" echo " Solaris process contract support: $SPC_MSG" diff --git a/sshd-session.c b/sshd-session.c -index ab88db7c5..dff1fefbe 100644 +index 03a028c82..f36d58b1b 100644 --- a/sshd-session.c +++ b/sshd-session.c @@ -110,6 +110,13 @@ @@ -120,7 +120,7 @@ index ab88db7c5..dff1fefbe 100644 /* Re-exec fds */ #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2) -@@ -1254,6 +1261,24 @@ main(int ac, char **av) +@@ -1256,6 +1263,24 @@ main(int ac, char **av) #ifdef SSH_AUDIT_EVENTS audit_connection_from(remote_ip, remote_port); #endif @@ -146,10 +146,10 @@ index ab88db7c5..dff1fefbe 100644 rdomain = ssh_packet_rdomain_in(ssh); diff --git a/sshd.8 b/sshd.8 -index c0f095ca4..e2a621950 100644 +index 08ebf53a1..464d402f6 100644 --- a/sshd.8 +++ b/sshd.8 -@@ -921,6 +921,12 @@ the user's home directory becomes accessible. +@@ -925,6 +925,12 @@ the user's home directory becomes accessible. This file should be writable only by the user, and need not be readable by anyone else. .Pp @@ -162,7 +162,7 @@ index c0f095ca4..e2a621950 100644 .It Pa /etc/hosts.equiv This file is for host-based authentication (see .Xr ssh 1 ) . -@@ -1023,6 +1029,7 @@ The content of this file is not sensitive; it can be world-readable. +@@ -1027,6 +1033,7 @@ The content of this file is not sensitive; it can be world-readable. .Xr ssh-keygen 1 , .Xr ssh-keyscan 1 , .Xr chroot 2 , |