X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/a122e99d41be2e0f03311cf41e3eda4935238056..45efc92a74987515bf9754584eaeb6ca0c251276:/src/adns.h diff --git a/src/adns.h b/src/adns.h index 0a2b6c8..f5e5310 100644 --- a/src/adns.h +++ b/src/adns.h @@ -51,7 +51,7 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * - * $Id: adns.h,v 1.71 1999/10/15 16:55:00 ian Exp $ + * $Id: adns.h,v 1.73 1999/11/07 19:15:36 ian Exp $ */ #ifndef ADNS_H_INCLUDED @@ -337,20 +337,21 @@ typedef struct { * requested. */ -int adns_init(adns_state *newstate_r, int flags /*adns_initflags*/, +int adns_init(adns_state *newstate_r, adns_initflags flags, FILE *diagfile /*0=>stderr*/); -int adns_init_strcfg(adns_state *newstate_r, int flags /*adns_initflags*/, +int adns_init_strcfg(adns_state *newstate_r, adns_initflags flags, FILE *diagfile /*0=>discard*/, const char *configtext); /* Configuration: * adns_init reads /etc/resolv.conf, which is expected to be (broadly - * speaking) in the format expected by libresolv. adns_init_strcfg - * is instead passed a string which is interpreted as if it were the - * contents of resolv.conf. In general, configuration which is set - * later overrides any that is set earlier. + * speaking) in the format expected by libresolv, and then + * /etc/resolv-adns.conf if it exists. adns_init_strcfg is instead + * passed a string which is interpreted as if it were the contents of + * resolv.conf or resolv-adns.conf. In general, configuration which + * is set later overrides any that is set earlier. * - * Standard directives understood in resolv.conf: + * Standard directives understood in resolv[-adns].conf: * * nameserver
* Must be followed by the IP address of a nameserver. Several @@ -383,7 +384,7 @@ int adns_init_strcfg(adns_state *newstate_r, int flags /*adns_initflags*/, * Each option consists of an option name, followed by optionally * a colon and a value. Options are listed below. * - * Non-standard directives understood in resolv.conf: + * Non-standard directives understood in resolv[-adns].conf: * * clearnameservers * Clears the list of nameservers, so that further nameserver lines @@ -392,7 +393,8 @@ int adns_init_strcfg(adns_state *newstate_r, int flags /*adns_initflags*/, * include