From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <hjl@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1039)
 id 2F8B13986801; Tue,  3 Nov 2020 20:05:14 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2F8B13986801
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: H.J. Lu <hjl@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] tst-setuid1-static-ENV: Add $(common-objpfx)nss [BZ #26820]
X-Act-Checkin: glibc
X-Git-Author: H.J. Lu <hjl.tools@gmail.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: e156dabc766d6f6f99ce9402999eae380a3ec1f2
X-Git-Newrev: fbb71eddb3b392982df12ba432d19f347c3799f6
Message-Id: <20201103200514.2F8B13986801@sourceware.org>
Date: Tue,  3 Nov 2020 20:05:14 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Nov 2020 20:05:14 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fbb71eddb3b392982df12ba432d19f347c3799f6

commit fbb71eddb3b392982df12ba432d19f347c3799f6
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Oct 30 11:09:55 2020 -0700

    tst-setuid1-static-ENV: Add $(common-objpfx)nss [BZ #26820]
    
    commit def674652eeac60c386d04733318b311f8a5b620
    Author: Florian Weimer <fweimer@redhat.com>
    Date:   Mon Apr 27 15:00:14 2020 +0200
    
        nptl/tst-setuid1-static: Improve isolation from system objects
    
        Static dlopen needs an LD_LIBRARY_PATH setting to avoid loading system
        libraries.
    
    missed $(common-objpfx)nss.  Add $(common-objpfx)nss to LD_LIBRARY_PATH
    for tst-setuid1-static to support
    
      struct passwd *pwd = getpwnam ("nobody");
    
    in nptl/tst-setuid1.c.

Diff:
---
 nptl/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index d47e8a81d9..f4134916b2 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -614,7 +614,7 @@ tst-audit-threads-ENV = LD_AUDIT=$(objpfx)tst-audit-threads-mod1.so
 # The test uses dlopen indirectly and would otherwise load system
 # objects.
 tst-setuid1-static-ENV = \
-  LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf
+  LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf:$(common-objpfx)nss
 
 # The tests here better do not run in parallel.
 ifeq ($(run-built-tests),yes)