Revisión | ce701584c53dd819ba000364d07da52a3744d343 (tree) |
---|---|
Tiempo | 2019-10-08 19:00:19 |
Autor | Peter Maydell <peter.maydell@lina...> |
Commiter | Peter Maydell |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp: Allow non-local DNS address when restrict is off
# gpg: Signature made Mon 07 Oct 2019 00:54:44 BST
# gpg: using RSA key 5ED9E856F7D6C6EAF51167A18D35C355720BBAFD
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
# gpg: aka "Samuel Thibault <sthibault@debian.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
# gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [unknown]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: 5ED9 E856 F7D6 C6EA F511 67A1 8D35 C355 720B BAFD
* remotes/thibault/tags/samuel-thibault:
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
@@ -456,7 +456,7 @@ static int net_slirp_init(NetClientState *peer, const char *model, | ||
456 | 456 | error_setg(errp, "Failed to parse DNS"); |
457 | 457 | return -1; |
458 | 458 | } |
459 | - if ((dns.s_addr & mask.s_addr) != net.s_addr) { | |
459 | + if (restricted && (dns.s_addr & mask.s_addr) != net.s_addr) { | |
460 | 460 | error_setg(errp, "DNS doesn't belong to network"); |
461 | 461 | return -1; |
462 | 462 | } |
@@ -522,7 +522,7 @@ static int net_slirp_init(NetClientState *peer, const char *model, | ||
522 | 522 | error_setg(errp, "Failed to parse IPv6 DNS"); |
523 | 523 | return -1; |
524 | 524 | } |
525 | - if (!in6_equal_net(&ip6_prefix, &ip6_dns, vprefix6_len)) { | |
525 | + if (restricted && !in6_equal_net(&ip6_prefix, &ip6_dns, vprefix6_len)) { | |
526 | 526 | error_setg(errp, "IPv6 DNS doesn't belong to network"); |
527 | 527 | return -1; |
528 | 528 | } |