1 From 10b0d16d04b811b1ccd1f9b0cfe757bce8d876a1 Mon Sep 17 00:00:00 2001
2 From: Khem Raj <raj.khem@gmail.com>
3 Date: Mon, 6 Apr 2015 23:02:21 -0700
4 Subject: [PATCH 2/3] resolve: musl does not implement res_ninit
7 http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
9 Upstream-Status: Pending
11 Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 gweb/gresolv.c | 33 ++++++++++++---------------------
14 1 file changed, 12 insertions(+), 21 deletions(-)
16 diff --git a/gweb/gresolv.c b/gweb/gresolv.c
17 index 5cf7a9a..3ad8e70 100644
21 #include <arpa/inet.h>
22 #include <arpa/nameser.h>
28 @@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index)
29 resolv->index = index;
30 resolv->nameserver_list = NULL;
32 - res_ninit(&resolv->res);
37 @@ -916,8 +914,6 @@ void g_resolv_unref(GResolv *resolv)
39 flush_nameservers(resolv);
41 - res_nclose(&resolv->res);
46 @@ -1020,24 +1016,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
47 debug(resolv, "hostname %s", hostname);
49 if (!resolv->nameserver_list) {
52 - for (i = 0; i < resolv->res.nscount; i++) {
54 - int family = resolv->res.nsaddr_list[i].sin_family;
55 - void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr;
57 - if (family != AF_INET &&
58 - resolv->res._u._ext.nsaddrs[i]) {
60 - sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr;
61 + FILE *f = fopen("/etc/resolv.conf", "r");
65 + while (fgets(line, sizeof(line), f)) {
66 + if (strncmp(line, "nameserver", 10) || !isspace(line[10]))
68 + for (s = &line[11]; isspace(s[0]); s++);
69 + for (i = 0; s[i] && !isspace(s[i]); i++);
71 + g_resolv_add_nameserver(resolv, s, 53, 0);
74 - if (family != AF_INET && family != AF_INET6)
77 - if (inet_ntop(family, sa_addr, buf, sizeof(buf)))
78 - g_resolv_add_nameserver(resolv, buf, 53, 0);
82 if (!resolv->nameserver_list)