summaryrefslogtreecommitdiff
path: root/src/clients/s6-dnsip4.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/clients/s6-dnsip4.c')
-rw-r--r--src/clients/s6-dnsip4.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/clients/s6-dnsip4.c b/src/clients/s6-dnsip4.c
index 370c006..6112e14 100644
--- a/src/clients/s6-dnsip4.c
+++ b/src/clients/s6-dnsip4.c
@@ -11,9 +11,7 @@
#include <skalibs/tai.h>
#include <skalibs/random.h>
-#include <s6-dns/s6dns-rci.h>
-#include <s6-dns/hosts.h>
-#include <s6-dns/s6dns-resolve.h>
+#include <s6-dns/s6dns.h>
#define USAGE "s6-dnsip4 [ -q ] [ -H | -h ] [ -r ] [ -t timeout ] domain"
#define dieusage() strerr_dieusage(100, USAGE)
@@ -53,13 +51,8 @@ int main (int argc, char const *const *argv)
if (t) tain_from_millisecs(&deadline, t) ; else deadline = tain_infinite_relative ;
tain_add_g(&deadline, &deadline) ;
- if (!s6dns_rci_init(&s6dns_rci_here, "/etc/resolv.conf"))
- strerr_diefu1sys(111, "initialize structures from /etc/resolv.conf") ;
- if (flaghosts)
- {
- flaghosts = s6dns_hosts_init(&s6dns_hosts_here, "/etc/hosts", "/etc/hosts.cdb", "/tmp/hosts.cdb") ;
- if (flaghosts == -1) strerr_diefu1sys(111, "initialize hosts database from /etc/hosts or /etc/hosts.cdb") ;
- }
+ if (!s6dns_init_options(flaghosts))
+ strerr_diefu1sys(111, "parse from /etc/resolv.conf or /etc/hosts") ;
if (flaghosts)
{