resolv.conf parsing: Rename OPTION_IS etc. to WORD_IS

[adns] / src / adns.h

diff --git a/src/adns.h b/src/adns.h
index 51b489bd0b4b92b4eff12b54719100d32cdfcd06..a6599f6db3cb13e8e5e1c4b1cc754b706bdb1e99 100644 (file)
--- a/src/adns.h
+++ b/src/adns.h
@@ -50,8 +50,6 @@
  *  or the GNU Library General Public License, as appropriate, along
  *  with this program; if not, write to the Free Software Foundation.
  *
  *  or the GNU Library General Public License, as appropriate, along
  *  with this program; if not, write to the Free Software Foundation.
  *

- *
- *  $Id$

  */
 
 #ifndef ADNS_H_INCLUDED
  */
 
 #ifndef ADNS_H_INCLUDED


@@ -591,6 +589,12 @@ int adns_init_logfn(adns_state *newstate_r, adns_initflags flags,
  *   Lookups occur (logically) concurrently; use the `sortlist' directive to
  *   control the relative order of addresses in answers.  This option
  *   overrides the corresponding init flags (covered by adns_if_afmask).
  *   Lookups occur (logically) concurrently; use the `sortlist' directive to
  *   control the relative order of addresses in answers.  This option
  *   overrides the corresponding init flags (covered by adns_if_afmask).

+ *
+ *  adns_ignoreunkcfg
+ *   Ignore unknown options and configuration directives, rather than
+ *   logging them.  To be effective, appear in the configuration
+ *   before the unknown options.  ADNS_RES_OPTIONS is generally early
+ *   enough.

  * 
  * There are a number of environment variables which can modify the
  * behaviour of adns.  They take effect only if adns_init is used, and
  * 
  * There are a number of environment variables which can modify the
  * behaviour of adns.  They take effect only if adns_init is used, and


@@ -711,8 +715,7 @@ int adns_addr2text(const struct sockaddr *sa, adns_queryflags flags,
    * port is always in host byte order and is simply copied to and
    * from the appropriate sockaddr field (byteswapped as necessary).
    *
    * port is always in host byte order and is simply copied to and
    * from the appropriate sockaddr field (byteswapped as necessary).
    *

-   * The only flags supported are adns_qf_addrlit_...; others are
-   * ignored.
+   * The only flags supported are adns_qf_addrlit_...

    *
    * Error return values are:
    *
    *
    * Error return values are:
    *


@@ -735,6 +738,8 @@ int adns_addr2text(const struct sockaddr *sa, adns_queryflags flags,
    *
    *  EAFNOSUPPORT   sa->sa_family is not supported (addr2text only).
    *
    *
    *  EAFNOSUPPORT   sa->sa_family is not supported (addr2text only).
    *

+   *  ENOSYS    Unsupported flags set.
+   *

    * Only if neither adns_qf_addrlit_scope_forbid nor
    * adns_qf_addrlit_scope_numeric are set:
    *
    * Only if neither adns_qf_addrlit_scope_forbid nor
    * adns_qf_addrlit_scope_numeric are set:
    *