From 9ac501e21b60a4131e31b55d21f6ee72cc7c5565 Mon Sep 17 00:00:00 2001 From: Nate Williams Date: Tue, 1 Oct 1996 16:09:18 +0000 Subject: [PATCH] There's no need to 'unsetenv()' unsafe environment variables explicitly since rt_readenv() already takes care of not setting unsafe variables. This was part of the changes I submitted to Peter and John during the review which must have gotten missed. --- gnu/usr.bin/ld/rtld/rtld.c | 7 +------ libexec/rtld-aout/rtld.c | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c index 9c532db1b7ac..28f74539a3cd 100644 --- a/gnu/usr.bin/ld/rtld/rtld.c +++ b/gnu/usr.bin/ld/rtld/rtld.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: rtld.c,v 1.35 1996/10/01 01:51:53 peter Exp $ + * $Id: rtld.c,v 1.36 1996/10/01 11:54:38 peter Exp $ */ #include @@ -319,11 +319,6 @@ struct _dynamic *dp; careful = (uid != euid) || (gid != egid); - if (careful) { - unsetenv("LD_LIBRARY_PATH"); - unsetenv("LD_PRELOAD"); - } - rt_readenv(); anon_open(); diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c index 9c532db1b7ac..28f74539a3cd 100644 --- a/libexec/rtld-aout/rtld.c +++ b/libexec/rtld-aout/rtld.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: rtld.c,v 1.35 1996/10/01 01:51:53 peter Exp $ + * $Id: rtld.c,v 1.36 1996/10/01 11:54:38 peter Exp $ */ #include @@ -319,11 +319,6 @@ struct _dynamic *dp; careful = (uid != euid) || (gid != egid); - if (careful) { - unsetenv("LD_LIBRARY_PATH"); - unsetenv("LD_PRELOAD"); - } - rt_readenv(); anon_open();