- Add a hint about /etc/host.conf mdns option removal to the parser

error reporting [bnc#569273]

OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=28
This commit is contained in:
Petr Baudis 2010-05-10 22:04:33 +00:00 committed by Git OBS Bridge
parent e6723e7880
commit 3219db2391
4 changed files with 27 additions and 0 deletions

View File

@ -0,0 +1,19 @@
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index ed55bec..f06db75 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -243,9 +243,12 @@ parse_line (const char *fname, int line_num, const char *str)
if (c == NULL)
{
char *buf;
+ char *hint = "";
- if (__asprintf (&buf, _("%s: line %d: bad command `%s'\n"),
- fname, line_num, start) < 0)
+ if (__strncasecmp (start, "mdns", len) == 0 && len == 4)
+ hint = "Multicast DNS is now configured in /etc/nsswitch.conf instead.\nSee also the package and manpage of nss-mdns.\n";
+ if (__asprintf (&buf, _("%s: line %d: bad command `%s'\n%s"),
+ fname, line_num, start, hint) < 0)
return;
__fxprintf (NULL, "%s", buf);

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 10 23:33:35 CEST 2010 - pbaudis@suse.cz
- Add a hint about /etc/host.conf mdns option removal to the parser
error reporting [bnc#569273]
-------------------------------------------------------------------
Tue May 4 05:47:41 UTC 2010 - aj@suse.de

View File

@ -142,6 +142,7 @@ Patch61: glibc-ppc64-vdso-time.diff
Patch62: nptl-ppc64-vdso-timedwait.diff
Patch63: glibc-getnprocs.diff
Patch64: glibc-gai-private4.diff
Patch65: glibc-resolv-mdnshint.diff
Patch500: ARM_glibc-2.10.1-local-eabi-wchar.diff
Patch501: ARM_glibc-2.10.1-local-hwcap-updates.diff
Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff
@ -367,6 +368,7 @@ rm nscd/s-stamp
%patch62 -p1
%patch63 -p1
%patch64
%patch65 -p1
%ifarch %arm armv5tel armv7l
%patch500
%patch501

0
ready Normal file
View File