From patchwork Mon Dec 9 13:57:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1206270 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-107852-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="aXfyKzeE"; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="CLTUHMnx"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47WlBC1gNdz9sPK for ; Tue, 10 Dec 2019 00:57:22 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=uFI Z1fXg/j0rWjnheSgCRrOQ/nf33QYmP42GcgmpTWdbtgM22T3SfSSVPyQK2J8VACt NGuTtVtADFq3xYUwonBL8i++PORzROaolzFJvRMqSbpy0LeaoSZXcV1GgfegzPUq KOxTBTfFpqdEgJ3/sQfYIszvlwpzP5QDuoK3LmoU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=G8/F2jIav SUdqbzQFwGu+aVKA00=; b=aXfyKzeEN5agLNzA/Wjhuc5soYFnieWK6DYL8IuMr 0kOrT9BLjvVKlDHTlu2PlmcMlkBiT+eJICoR7UMnum+B2rgTB1CwEyMv+r5PxOXZ 2c8Z4dNilSfURYHAdTupv86A6sXkMPhoYLHn6AsJFngKSb0Apo1xxYk8FoF2jiXD nQ= Received: (qmail 49885 invoked by alias); 9 Dec 2019 13:57:17 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 49873 invoked by uid 89); 9 Dec 2019 13:57:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: us-smtp-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575899834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6jD8ojQgLkA8qWUTRNhtkcc51d6FNn074IDPk5g8/s=; b=CLTUHMnxCF1ByHpo8qr5drc4tV30cDJgp/+FEjBrXZTLS87NUCRLlt8uvwdqtB594eCIms xqIKtfE6RGpRjetChqASvw+PNK0k6U54lW9ModW6GysOY2Ctse5Ly7SmskuuZ8oKBvN558 GlqznRjUeGVc1VytWSHNXwW2jZO/F6s= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] ldconfig: Do not print a warning for a missing ld.so.conf file Date: Mon, 09 Dec 2019 14:57:10 +0100 Message-ID: <878snla9ft.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 The configuration file is not needed for working system, so printing a warning is not helpful. ----- elf/ldconfig.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Carlos O'Donell diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 139161b3a6..62bbe77a88 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;