commit a88d9ace234a24ce1c17189642ef9104799425e0
author Samuel Thibault <samuel.thibault@ens-lyon.org> Mon Jul 05 20:31:34 2021 +0000
committer Samuel Thibault <samuel.thibault@ens-lyon.org> Mon Jul 05 20:31:34 2021 +0000
tree 240c9a562a9d55ac1c923dfa8bf6da26710081bc
parent cdfbb3c2a46c3277241b3ccf0172be977701fd4a
parent 71088655b5832dcbade47535f2b496b50ae7badf

Merge branch 'master' into 'master'

Haiku: proper path to resolv.conf for DNS server

See merge request slirp/libslirp!99

src/slirp.c

diff --git a/src/slirp.c b/src/slirp.c
index 5d60cb5..9d3fee3 100644
--- a/src/slirp.c
+++ b/src/slirp.c
@@ -218,6 +218,12 @@
 
 #else // !defined(_WIN32) && !defined(__APPLE__)
 
+#if defined(__HAIKU__)
+#define RESOLV_CONF_PATH "/boot/system/settings/network/resolv.conf"
+#else
+#define RESOLV_CONF_PATH "/etc/resolv.conf"
+#endif
+
 static int get_dns_addr_cached(void *pdns_addr, void *cached_addr,
                                socklen_t addrlen, struct stat *cached_stat,
                                unsigned *cached_time)
@@ -228,7 +234,7 @@
         return 0;
     }
     old_stat = *cached_stat;
-    if (stat("/etc/resolv.conf", cached_stat) != 0) {
+    if (stat(RESOLV_CONF_PATH, cached_stat) != 0) {
         return -1;
     }
     if (cached_stat->st_dev == old_stat.st_dev &&
@@ -256,7 +262,7 @@
     unsigned if_index;
 
     assert(sizeof(tmp_addr) >= addrlen);
-    f = fopen("/etc/resolv.conf", "r");
+    f = fopen(RESOLV_CONF_PATH, "r");
     if (!f)
         return -1;