From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 37705 invoked by alias); 11 Dec 2019 08:20:09 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 37671 invoked by uid 9299); 11 Dec 2019 08:20:09 -0000 Date: Wed, 11 Dec 2019 08:20:00 -0000 Message-ID: <20191211082009.37669.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] ldconfig: Do not print a warning for a missing ld.so.conf file X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: e46efff89550a8e693a3362976f85070762c5cb8 X-Git-Newrev: b5a1271c76ad03a2e0ee044ecb46af03d771e40a X-SW-Source: 2019-q4/txt/msg00558.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b5a1271c76ad03a2e0ee044ecb46af03d771e40a commit b5a1271c76ad03a2e0ee044ecb46af03d771e40a Author: Florian Weimer Date: Wed Dec 11 09:19:39 2019 +0100 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 Diff: --- elf/ldconfig.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 139161b..62bbe77 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;