tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert a diff I didn't mean to commit

This commit is contained in:
Damien Miller 2014-05-21 17:13:36 +10:00
parent 795b86313f
commit e84d10302a
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
channels.c
View File

@ -2700,7 +2700,6 @@ channel_set_af(int af)
* "0.0.0.0" -> wildcard v4/v6 if SSH_OLD_FORWARD_ADDR * "0.0.0.0" -> wildcard v4/v6 if SSH_OLD_FORWARD_ADDR
* "" (empty string), "*" -> wildcard v4/v6 * "" (empty string), "*" -> wildcard v4/v6
* "localhost" -> loopback v4/v6 * "localhost" -> loopback v4/v6
* "127.0.0.1" / "::1" -> accepted even if gateway_ports isn't set
*/ */
static const char * static const char *
channel_fwd_bind_addr(const char *listen_addr, int *wildcardp, channel_fwd_bind_addr(const char *listen_addr, int *wildcardp,
@ -2730,20 +2729,9 @@ channel_fwd_bind_addr(const char *listen_addr, int *wildcardp,
"\"%s\" overridden by server " "\"%s\" overridden by server "
"GatewayPorts", listen_addr); "GatewayPorts", listen_addr);
} }
} else if (strcmp(listen_addr, "localhost") != 0 ||
strcmp(listen_addr, "127.0.0.1") == 0 ||
strcmp(listen_addr, "::1") == 0) {
/* Accept localhost address when GatewayPorts=yes */
addr = listen_addr;
} }
} else if (strcmp(listen_addr, "127.0.0.1") == 0 || else if (strcmp(listen_addr, "localhost") != 0)
strcmp(listen_addr, "::1") == 0) { addr = listen_addr;
/*
* If a specific IPv4/IPv6 localhost address has been
* requested then accept it even if gateway_ports is in
* effect. This allows the client to prefer IPv4 or IPv6.
*/
addr = listen_addr;
} }
if (wildcardp != NULL) if (wildcardp != NULL)
*wildcardp = wildcard; *wildcardp = wildcard;