2f85740ecc
2.) Add a wrapper function __findenv() which implements the previous *internal* interface. It turns out that ld.elf_so(1) and pthread(3) both use it. Stripping e.g. "LD_LIBRARY_PATH" from the environment while running setuid binaries works again now.
66 lines
2.0 KiB
C
66 lines
2.0 KiB
C
/* $NetBSD: env.h,v 1.2 2010/11/14 22:04:36 tron Exp $ */
|
|
|
|
/*-
|
|
* Copyright (c) 2010 The NetBSD Foundation, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
|
* by Matthias Scheler.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
|
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
|
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "reentrant.h"
|
|
|
|
extern ssize_t __getenvslot(const char *name, size_t l_name, bool allocate);
|
|
extern char *__findenvvar(const char *name, size_t l_name);
|
|
|
|
#ifdef _REENTRANT
|
|
extern bool __readlockenv(void);
|
|
extern bool __writelockenv(void);
|
|
extern bool __unlockenv(void);
|
|
#else
|
|
static __inline bool
|
|
__readlockenv(void)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static __inline bool
|
|
__writelockenv(void)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static __inline bool
|
|
__unlocklockenv(void)
|
|
{
|
|
return true;
|
|
}
|
|
#endif
|
|
|
|
extern char **environ;
|