From 043440e761d395e1f507d9faa6e82b3fe4536c3f Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 13 Mar 2019 14:58:58 +0100 Subject: [PATCH] hurd: Add no-op version of __res_enable_icmp [BZ #24047] Mach does not support IP_RECVERR, so replace this function with a stub in a sysdeps override for Hurd. This fixes commit 08504de71813ddbd447bfbca4a325cbe8ce8bcda ("resolv: Enable full ICMP errors for UDP DNS sockets [BZ #24047]"). Reviewed-by: Carlos O'Donell --- ChangeLog | 5 +++++ sysdeps/mach/hurd/res_enable_icmp.c | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 sysdeps/mach/hurd/res_enable_icmp.c diff --git a/ChangeLog b/ChangeLog index d616178..94ffb74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-03-13 Florian Weimer + + [BZ #24047] + * sysdeps/mach/hurd/res_enable_icmp.c: New file. + 2019-03-13 Zack Weinberg * sysdeps/generic/inttypes.h, sysdeps/generic/stdint.h: diff --git a/sysdeps/mach/hurd/res_enable_icmp.c b/sysdeps/mach/hurd/res_enable_icmp.c new file mode 100644 index 0000000..4b04563 --- /dev/null +++ b/sysdeps/mach/hurd/res_enable_icmp.c @@ -0,0 +1,27 @@ +/* Enable full ICMP errors on a socket. No-op version for Hurd. + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Mach does not support the IP_RECVERR extension. */ + +#include + +int +__res_enable_icmp (int family, int fd) +{ + return 0; +} -- 2.7.4