diff --git a/include/proto/dns.h b/include/proto/dns.h
index 4ccbfa0..170eefa 100644
--- a/include/proto/dns.h
+++ b/include/proto/dns.h
@@ -34,8 +34,8 @@
 uint16_t dns_rnd16(void);
 int dns_validate_dns_response(unsigned char *resp, unsigned char *bufend, char *dn_name, int dn_name_len);
 int dns_get_ip_from_response(unsigned char *resp, unsigned char *resp_end,
-                             char *dn_name, int dn_name_len, void *currentip,
-                             short currentip_sin_family, int family_priority,
+                             struct dns_resolution *resol, void *currentip,
+                             short currentip_sin_family,
                              void **newip, short *newip_sin_family);
 void dns_resolve_send(struct dgram_conn *dgram);
 void dns_resolve_recv(struct dgram_conn *dgram);
diff --git a/include/types/dns.h b/include/types/dns.h
index ea1a9f9..cf784cd 100644
--- a/include/types/dns.h
+++ b/include/types/dns.h
@@ -140,6 +140,10 @@
 	} counters;
 };
 
+struct dns_options {
+	int family_prio;	/* which IP family should the resolver use when both are returned */
+};
+
 /*
  * resolution structure associated to single server and used to manage name resolution for
  * this server.
@@ -155,7 +159,7 @@
 					/* requester callback, for error management */
 	char *hostname_dn;		/* server hostname in domain name label format */
 	int hostname_dn_len;		/* server domain name label len */
-	int resolver_family_priority;	/* which IP family should the resolver use when both are returned */
+	struct dns_options *opts;       /* IP selection options inherited from the configuration file. */
 	unsigned int last_resolution;	/* time of the lastest valid resolution */
 	unsigned int last_sent_packet;	/* time of the latest DNS packet sent */
 	unsigned int last_status_change;	/* time of the latest DNS resolution status change */
diff --git a/include/types/server.h b/include/types/server.h
index 3e25c34..c04af9c 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -35,6 +35,7 @@
 
 #include <types/connection.h>
 #include <types/counters.h>
+#include <types/dns.h>
 #include <types/freq_ctr.h>
 #include <types/obj_type.h>
 #include <types/proxy.h>
@@ -224,7 +225,7 @@
 	char *resolvers_id;			/* resolvers section used by this server */
 	char *hostname;				/* server hostname */
 	struct dns_resolution *resolution;	/* server name resolution */
-	int resolver_family_priority;		/* which IP family should the resolver use when both are returned */
+	struct dns_options dns_opts;
 
 #ifdef USE_OPENSSL
 	int use_ssl;				/* ssl enabled */