Commit | Line | Data |
---|---|---|
2bef1b09 FF |
1 | diff -u -r ../gnupg-2.1.22/dirmngr/dns.c ./dirmngr/dns.c |
2 | --- ../gnupg-2.1.22/dirmngr/dns.c 2017-07-25 09:37:05.000000000 +0200 | |
3 | +++ ./dirmngr/dns.c 2017-07-29 20:54:37.445647974 +0200 | |
4 | @@ -5424,7 +5424,7 @@ | |
4b971e52 FF |
5 | if (!(resconf = dns_resconf_open(&error))) |
6 | goto error; | |
7 | ||
8 | - if ((error = dns_resconf_loadpath(resconf, "/etc/resolv.conf"))) { | |
9 | + if ((error = dns_resconf_loadpath(resconf, "@TERMUX_PREFIX@/etc/resolv.conf"))) { | |
10 | /* | |
11 | * NOTE: Both the glibc and BIND9 resolvers ignore a missing | |
12 | * /etc/resolv.conf, defaulting to a nameserver of | |
2bef1b09 FF |
13 | @@ -5436,7 +5436,7 @@ |
14 | goto error; | |
15 | } | |
16 | ||
17 | - if ((error = dns_nssconf_loadpath(resconf, "/etc/nsswitch.conf"))) { | |
18 | + if ((error = dns_nssconf_loadpath(resconf, "@TERMUX_PREFIX@/etc/nsswitch.conf"))) { | |
19 | if (error != ENOENT) | |
20 | goto error; | |
21 | } | |
22 | @@ -10407,7 +10407,7 @@ | |
4b971e52 FF |
23 | panic("dns_resconf_open: %s", dns_strerror(error)); |
24 | ||
25 | if (!MAIN.resconf.count) | |
26 | - MAIN.resconf.path[MAIN.resconf.count++] = "/etc/resolv.conf"; | |
27 | + MAIN.resconf.path[MAIN.resconf.count++] = "@TERMUX_PREFIX@/etc/resolv.conf"; | |
28 | ||
29 | for (i = 0; i < MAIN.resconf.count; i++) { | |
30 | path = MAIN.resconf.path[i]; | |
2bef1b09 FF |
31 | diff -u -r ../gnupg-2.1.22/dirmngr/dns-stuff.c ./dirmngr/dns-stuff.c |
32 | --- ../gnupg-2.1.22/dirmngr/dns-stuff.c 2017-05-25 20:24:30.000000000 +0200 | |
33 | +++ ./dirmngr/dns-stuff.c 2017-07-29 20:54:00.414067929 +0200 | |
34 | @@ -114,7 +114,7 @@ | |
35 | #define DEFAULT_TIMEOUT 30 | |
36 | ||
37 | ||
38 | -#define RESOLV_CONF_NAME "/etc/resolv.conf" | |
39 | +#define RESOLV_CONF_NAME "@TERMUX_PREFIX@/etc/resolv.conf" | |
4b971e52 | 40 | |
2bef1b09 FF |
41 | /* Two flags to enable verbose and debug mode. */ |
42 | static int opt_verbose; |