--- old/usr/src/lib/libresolv2/include/conf/sunoptions.h
          +++ new/usr/src/lib/libresolv2/include/conf/sunoptions.h
   1    1  /*
   2      - * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
        2 + * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
   3    3   * Use is subject to license terms.
   4    4   */
   5    5  
   6    6  #ifndef _SUNOPTIONS_H
   7    7  #define _SUNOPTIONS_H
   8    8  
   9      -#pragma ident   "%Z%%M% %I%     %E% SMI"
        9 +#define USELOOPBACK     /* Resolver library defaults to 127.0.0.1 */
  10   10  
  11      -/*
  12      - * The following options are PP flags available in the reference implementation
  13      - * but do not get compiled due to the elimination of the options.h file
  14      - * This section selectively reintroduces them
  15      - */
  16      -
  17      -#define HAVE_GETRUSAGE
  18      -
  19      -/*
  20      - * The following options are PP flags introduced as part of the Sun/Solaris
  21      - * port.
  22      - */
  23      -
  24      -/* We may have to pull this out */
  25      -#define SUNW_LIBNSL     /* conflicts for inet_addr, inet_ntoa */
  26      -
  27   11  /* Additions for Solaris 2 */
  28      -#define SUNW_NSSEARCH   /* fix nslookup domain search */
  29      -#define SUNW_AVOIDOVERFLOW      /* Avoid buffer overflows */
  30      -#define SUNW_INITCHKIF  /* Check if any non-loopback interface is up */
  31      -#define SUNW_DOMAINFROMNIS      /* Default domain name from NIS/NIS+ */
  32      -#define USELOOPBACK     /* Resolver library defaults to 127.0.0.1 */
  33      -#define SUNW_CONFCHECK  /* Abort quickly if no /etc/resolv.conf or local */
  34      -                        /* named */
  35      -#define SUNW_AREWEINNAMED       /* Override _confcheck if proc is in.named */
  36      -#define SUNW_OPENFDOFFSET       /* Open non-stdio fd:s with offset */
  37      -#define SUNW_POLL       /* Use poll(2) instead of select(3) */
       12 +
       13 +#define SUNW_INITCHKIF          /* Check if any non-loopback interface is up */
       14 +#define SUNW_CONFCHECK          /* Abort quickly if no /etc/resolv.conf or */
       15 +                                /* local named */
  38   16  #define SUNW_HOSTS_FALLBACK     /* Configurable /etc/hosts fallback */
  39      -#define SUNW_LISTEN_BACKLOG     /* Configurable listen(3N) backlog (named) */
  40      -#define SUNW_REJECT_BOGUS_H_LENGTH      /* (libresolv) */
  41   17  #define SUNW_HNOK_UNDERSCORE    /* Allow underscore in hostnames (libresolv) */
  42   18  #define SUNW_MT_RESOLVER        /* MT hot extensions (libresolv) */
  43      -#define SUNW_QSTREAM_CLEANUP    /* Avoid using free()d struct qstreams */
  44   19  #define SUNW_SETHERRNO          /* ISC does not set h_errno in gethostbyname */
  45   20  #define SUNW_OVERRIDE_RETRY     /* Allow NS switch to override res->retry */
  46      -#define SUNW_CLOSEFROM          /* closefrom(3C) per PSARC 2000/193 */
  47      -#define SUNW_AVOIDSTDIO_FDLIMIT /* Avoid 256 file descriptor limit in stdio */
  48   21  #define SUNW_LIBMD5     /* Use md5(3EXT) instead of internal implementation */
  49   22  
  50   23  /* If compiling an MT warm libresolv, we also need reentrancy */
  51   24  #if     defined(SUNW_MT_RESOLVER) && !defined(_REENTRANT)
  52   25  #define _REENTRANT
  53   26  #endif
  54   27  
  55      -/* SUNW_AREWEINNAMED and SUNW_CONFCHECCK are mutually inclusive */
  56      -#if     defined(SUNW_AREWEINNAMED) && !defined(SUNW_CONFCHECK)
  57      -#define SUNW_CONFCHECK
  58      -#endif
  59      -
  60   28  /* End additions for Solaris 2 */
  61   29  
  62   30  #endif /* _SUNOPTIONS_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX