From 14320ca590c912a2e726a070049faddf01b01a38 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 25 Jul 2016 14:38:39 +0200 Subject: [PATCH] The upstream bug #2257 is fixed --- openssh-6.6p1-set_remote_ipaddr.patch | 84 --------------------------- openssh.spec | 4 -- 2 files changed, 88 deletions(-) delete mode 100644 openssh-6.6p1-set_remote_ipaddr.patch diff --git a/openssh-6.6p1-set_remote_ipaddr.patch b/openssh-6.6p1-set_remote_ipaddr.patch deleted file mode 100644 index f601e3d..0000000 --- a/openssh-6.6p1-set_remote_ipaddr.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -up openssh-6.8p1/canohost.c.set_remote_ipaddr openssh-6.8p1/canohost.c ---- openssh-6.8p1/canohost.c.set_remote_ipaddr 2015-03-18 12:40:03.702925550 +0100 -+++ openssh-6.8p1/canohost.c 2015-03-18 12:40:03.749925432 +0100 -@@ -349,6 +349,21 @@ clear_cached_addr(void) - cached_port = -1; - } - -+void set_remote_ipaddr(void) { -+ if (canonical_host_ip != NULL) -+ free(canonical_host_ip); -+ -+ if (active_state != NULL && packet_connection_is_on_socket()) { -+ canonical_host_ip = -+ get_peer_ipaddr(packet_get_connection_in()); -+ if (canonical_host_ip == NULL) -+ cleanup_exit(255); -+ } else { -+ /* If not on socket, return UNKNOWN. */ -+ canonical_host_ip = xstrdup("UNKNOWN"); -+ } -+} -+ - /* - * Returns the IP-address of the remote host as a string. The returned - * string must not be freed. -@@ -358,17 +373,9 @@ const char * - get_remote_ipaddr(void) - { - /* Check whether we have cached the ipaddr. */ -- if (canonical_host_ip == NULL) { -- if (packet_connection_is_on_socket()) { -- canonical_host_ip = -- get_peer_ipaddr(packet_get_connection_in()); -- if (canonical_host_ip == NULL) -- cleanup_exit(255); -- } else { -- /* If not on socket, return UNKNOWN. */ -- canonical_host_ip = xstrdup("UNKNOWN"); -- } -- } -+ if (canonical_host_ip == NULL) -+ set_remote_ipaddr(); -+ - return canonical_host_ip; - } - -diff -up openssh-6.8p1/canohost.h.set_remote_ipaddr openssh-6.8p1/canohost.h ---- openssh-6.8p1/canohost.h.set_remote_ipaddr 2015-03-17 06:49:20.000000000 +0100 -+++ openssh-6.8p1/canohost.h 2015-03-18 12:40:03.749925432 +0100 -@@ -13,6 +13,7 @@ - */ - - const char *get_canonical_hostname(int); -+void set_remote_ipaddr(void); - const char *get_remote_ipaddr(void); - const char *get_remote_name_or_ip(u_int, int); - -diff -up openssh-6.8p1/sshconnect.c.set_remote_ipaddr openssh-6.8p1/sshconnect.c ---- openssh-6.8p1/sshconnect.c.set_remote_ipaddr 2015-03-17 06:49:20.000000000 +0100 -+++ openssh-6.8p1/sshconnect.c 2015-03-18 12:40:58.096788804 +0100 -@@ -65,6 +65,7 @@ - #include "authfile.h" - #include "ssherr.h" - #include "authfd.h" -+#include "canohost.h" - - char *client_version_string = NULL; - char *server_version_string = NULL; -@@ -174,6 +175,7 @@ ssh_proxy_fdpass_connect(const char *hos - - /* Set the connection file descriptors. */ - packet_set_connection(sock, sock); -+ set_remote_ipaddr(); - - return 0; - } -@@ -496,6 +498,7 @@ ssh_connect_direct(const char *host, str - - /* Set the connection. */ - packet_set_connection(sock, sock); -+ set_remote_ipaddr(); - - return 0; - } diff --git a/openssh.spec b/openssh.spec index 13f883b..77c6676 100644 --- a/openssh.spec +++ b/openssh.spec @@ -188,9 +188,6 @@ Patch900: openssh-6.1p1-gssapi-canohost.patch Patch901: openssh-6.6p1-kuserok.patch # Use tty allocation for a remote scp (#985650) Patch906: openssh-6.4p1-fromto-remote.patch -# set a client's address right after a connection is set -# http://bugzilla.mindrot.org/show_bug.cgi?id=2257 -Patch911: openssh-6.6p1-set_remote_ipaddr.patch # apply RFC3454 stringprep to banners when possible # https://bugzilla.mindrot.org/show_bug.cgi?id=2058 # slightly changed patch from comment 10 @@ -463,7 +460,6 @@ popd %patch900 -p1 -b .canohost %patch901 -p1 -b .kuserok %patch906 -p1 -b .fromto-remote -%patch911 -p1 -b .set_remote_ipaddr %patch912 -p1 -b .utf8-banner %patch914 -p1 -b .servconf %patch916 -p1 -b .contexts