Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / resolv / res_hconf.h

diff --git a/resolv/res_hconf.h b/resolv/res_hconf.h
index 42cef79965a19f60bd8bdcb78ffb33f47d42ef02..c29a1888a50e4c32d896283955edf26af52bf609 100644 (file)
--- a/resolv/res_hconf.h
+++ b/resolv/res_hconf.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David Mosberger (davidm@azstarnet.com).
 
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _RES_HCONF_H_
 #define _RES_HCONF_H_
@@ -25,6 +25,15 @@
 
 struct hconf
 {
+  /* We keep the INITIALIZED member only for backwards compatibility.  New
+     code should just call _res_hconf_init unconditionally.  For this field
+     to be used safely, users must ensure that either (1) a call to
+     _res_hconf_init happens-before any load from INITIALIZED, or (2) an
+     assignment of zero to INITIALIZED happens-before any load from it, and
+     these loads use acquire MO if the intent is to skip calling
+     _res_hconf_init if the load returns a nonzero value.  Such acquire MO
+     loads will then synchronize with the release MO store to INITIALIZED
+     in do_init in res_hconf.c; see pthread_once for more detail.  */
   int initialized;
   int unused1;
   int unused2[4];
@@ -32,14 +41,12 @@ struct hconf
   const char *trimdomain[TRIMDOMAINS_MAX];
   unsigned int flags;
 #  define HCONF_FLAG_INITED    (1 << 0) /* initialized? */
-#  define HCONF_FLAG_SPOOF     (1 << 1) /* refuse spoofed addresses */
-#  define HCONF_FLAG_SPOOFALERT        (1 << 2) /* syslog warning of spoofed */
 #  define HCONF_FLAG_REORDER   (1 << 3) /* list best address first */
 #  define HCONF_FLAG_MULTI     (1 << 4) /* see comments for gethtbyname() */
 };
 extern struct hconf _res_hconf;
 
-extern void _res_hconf_init (void);
+extern void _res_hconf_init (void) attribute_hidden;
 extern void _res_hconf_trim_domain (char *domain);
 extern void _res_hconf_trim_domains (struct hostent *hp);
 extern void _res_hconf_reorder_addrs (struct hostent *hp);