]>
Commit | Line | Data |
---|---|---|
2d6ae067 AM |
1 | Description: fix build with glibc 2.30 |
2 | glibc 2.30 release notes at | |
3 | https://savannah.gnu.org/forum/forum.php?forum_id=9515 states: | |
4 | """ | |
5 | Support for the "inet6" option in /etc/resolv.conf and the RES_USE_INET6 | |
6 | resolver flag (deprecated in glibc 2.25) have been removed. | |
7 | ... | |
8 | The obsolete RES_INSECURE1 and RES_INSECURE2 option flags for the DNS stub | |
9 | resolver have been removed from <resolv.h>. | |
10 | """ | |
11 | And RES_AAONLY and RES_PRIMARY are already flagged as deprecated and are | |
12 | being guarded with the same fix. | |
13 | Origin: upstream, https://github.com/vdukhovni/postfix/commit/3274c3cea9d739f86e84b65664aabb692e37e83f#diff-777bfb681a1cd539ddc8e1e606959ffa | |
14 | Bug: http://postfix.1071664.n5.nabble.com/build-failure-with-glibc-2-30-td102511.html | |
15 | Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923 | |
16 | Last-Update: 2019-09-05 | |
17 | --- | |
18 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
19 | diff --git a/postfix/src/dns/dns_str_resflags.c b/postfix/src/dns/dns_str_resflags.c | |
20 | index 5f2cce5e..472394c3 100644 | |
21 | --- a/src/dns/dns_str_resflags.c | |
22 | +++ b/src/dns/dns_str_resflags.c | |
23 | @@ -52,18 +52,28 @@ | |
24 | static const LONG_NAME_MASK resflag_table[] = { | |
25 | "RES_INIT", RES_INIT, | |
26 | "RES_DEBUG", RES_DEBUG, | |
27 | +#ifdef RES_AAONLY | |
28 | "RES_AAONLY", RES_AAONLY, | |
29 | +#endif | |
30 | "RES_USEVC", RES_USEVC, | |
31 | +#ifdef RES_PRIMARY | |
32 | "RES_PRIMARY", RES_PRIMARY, | |
33 | +#endif | |
34 | "RES_IGNTC", RES_IGNTC, | |
35 | "RES_RECURSE", RES_RECURSE, | |
36 | "RES_DEFNAMES", RES_DEFNAMES, | |
37 | "RES_STAYOPEN", RES_STAYOPEN, | |
38 | "RES_DNSRCH", RES_DNSRCH, | |
39 | +#ifdef RES_INSECURE1 | |
40 | "RES_INSECURE1", RES_INSECURE1, | |
41 | +#endif | |
42 | +#ifdef RES_INSECURE2 | |
43 | "RES_INSECURE2", RES_INSECURE2, | |
44 | +#endif | |
45 | "RES_NOALIASES", RES_NOALIASES, | |
46 | +#ifdef RES_USE_INET6 | |
47 | "RES_USE_INET6", RES_USE_INET6, | |
48 | +#endif | |
49 | #ifdef RES_ROTATE | |
50 | "RES_ROTATE", RES_ROTATE, | |
51 | #endif |