From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 11 Dec 2019 08:19:39 +0000 (+0100)
Subject: ldconfig: Do not print a warning for a missing ld.so.conf file
X-Git-Tag: glibc-2.31~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5a1271c76ad03a2e0ee044ecb46af03d771e40a;p=thirdparty%2Fglibc.git

ldconfig: Do not print a warning for a missing ld.so.conf file

The configuration file is not needed for working system, so printing a
warning is not helpful.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 139161b3a62..62bbe77a88f 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1079,9 +1079,10 @@ parse_conf (const char *filename, bool do_chroot)
 
   if (file == NULL)
     {
-      error (0, errno, _("\
+      if (errno != ENOENT)
+	error (0, errno, _("\
 Warning: ignoring configuration file that cannot be opened: %s"),
-	     canon);
+	       canon);
       if (canon != filename)
 	free ((char *) canon);
       return;