This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.24-535-g7d68cda
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Dec 2016 16:05:29 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.24-535-g7d68cda
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 7d68cdaa4f748e87ee921f587ee2d483db624b3d (commit)
from 5c6e6747356f5d473c2c62e818bc24432ddef3e2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7d68cdaa4f748e87ee921f587ee2d483db624b3d
commit 7d68cdaa4f748e87ee921f587ee2d483db624b3d
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Dec 27 16:01:06 2016 +0100
resolv: Remove processing of unimplemented "spoof" host.conf options
diff --git a/ChangeLog b/ChangeLog
index 55fa54f..8c072b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2016-12-27 Florian Weimer <fweimer@redhat.com>
+ * resolv/res_hconf.h (HCONF_FLAG_SPOOF, HCONF_FLAG_SPOOFALERT):
+ Remove.
+ * resolv/res_hconf.c (ENV_SPOOF, arg_spoof): Remove.
+ (cmd): Remove spoof, nospoof, spoofalert.
+ (parse_line): Ignore spoof-related lines.
+ (do_init): Do not process RESOLV_SPOOF_CHECK.
+
+2016-12-27 Florian Weimer <fweimer@redhat.com>
+
[BZ #20964]
sunrpc: Always obtain AF_INET addresses from NSS.
* include/rpc/rpc.h (__libc_rpc_gethostbyname): Declare.
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index 093c268..0021fa6 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -21,9 +21,6 @@
Though mostly compatibly, the following differences exist compared
to the original implementation:
- - new command "spoof" takes an arguments like RESOLV_SPOOF_CHECK
- environment variable (i.e., `off', `nowarn', or `warn').
-
- line comments can appear anywhere (not just at the beginning of
a line)
*/
@@ -55,7 +52,6 @@
/* Environment vars that all user to override default behavior: */
#define ENV_HOSTCONF "RESOLV_HOST_CONF"
-#define ENV_SPOOF "RESOLV_SPOOF_CHECK"
#define ENV_TRIM_OVERR "RESOLV_OVERRIDE_TRIM_DOMAINS"
#define ENV_TRIM_ADD "RESOLV_ADD_TRIM_DOMAINS"
#define ENV_MULTI "RESOLV_MULTI"
@@ -65,7 +61,6 @@ enum parse_cbs
{
CB_none,
CB_arg_trimdomain_list,
- CB_arg_spoof,
CB_arg_bool
};
@@ -78,10 +73,7 @@ static const struct cmd
{
{"order", CB_none, 0},
{"trim", CB_arg_trimdomain_list, 0},
- {"spoof", CB_arg_spoof, 0},
{"multi", CB_arg_bool, HCONF_FLAG_MULTI},
- {"nospoof", CB_arg_bool, HCONF_FLAG_SPOOF},
- {"spoofalert", CB_arg_bool, HCONF_FLAG_SPOOFALERT},
{"reorder", CB_arg_bool, HCONF_FLAG_REORDER}
};
@@ -164,28 +156,6 @@ arg_trimdomain_list (const char *fname, int line_num, const char *args)
static const char *
-arg_spoof (const char *fname, int line_num, const char *args)
-{
- const char *start = args;
- size_t len;
-
- args = skip_string (args);
- len = args - start;
-
- if (len == 3 && __strncasecmp (start, "off", len) == 0)
- _res_hconf.flags &= ~(HCONF_FLAG_SPOOF | HCONF_FLAG_SPOOFALERT);
- else
- {
- _res_hconf.flags |= (HCONF_FLAG_SPOOF | HCONF_FLAG_SPOOFALERT);
- if ((len == 6 && __strncasecmp (start, "nowarn", len) == 0)
- || !(len == 4 && __strncasecmp (start, "warn", len) == 0))
- _res_hconf.flags &= ~HCONF_FLAG_SPOOFALERT;
- }
- return args;
-}
-
-
-static const char *
arg_bool (const char *fname, int line_num, const char *args, unsigned flag)
{
if (__strncasecmp (args, "on", 2) == 0)
@@ -261,8 +231,6 @@ parse_line (const char *fname, int line_num, const char *str)
if (c->cb == CB_arg_trimdomain_list)
str = arg_trimdomain_list (fname, line_num, str);
- else if (c->cb == CB_arg_spoof)
- str = arg_spoof (fname, line_num, str);
else if (c->cb == CB_arg_bool)
str = arg_bool (fname, line_num, str, c->arg);
else
@@ -325,10 +293,6 @@ do_init (void)
fclose (fp);
}
- envval = getenv (ENV_SPOOF);
- if (envval)
- arg_spoof (ENV_SPOOF, 1, envval);
-
envval = getenv (ENV_MULTI);
if (envval)
arg_bool (ENV_MULTI, 1, envval, HCONF_FLAG_MULTI);
diff --git a/resolv/res_hconf.h b/resolv/res_hconf.h
index a3d23f3..a6a1a9b 100644
--- a/resolv/res_hconf.h
+++ b/resolv/res_hconf.h
@@ -41,8 +41,6 @@ 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() */
};
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
resolv/res_hconf.c | 36 ------------------------------------
resolv/res_hconf.h | 2 --
3 files changed, 9 insertions(+), 38 deletions(-)
hooks/post-receive
--
GNU C Library master sources