diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1995-10-20 22:17:35 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1995-10-20 22:17:35 +0000 |
| commit | d549e5cc7f6952808dfca1d55d2e624390fc5d74 (patch) | |
| tree | 5cea518838b337a37c46e1072361234fb5a13807 | |
| parent | 1bfde0aca4ee296806f907253d0768303d727fa8 (diff) | |
Notes
| -rw-r--r-- | eBones/libexec/telnetd/sys_term.c | 14 | ||||
| -rw-r--r-- | libexec/telnetd/sys_term.c | 14 | ||||
| -rw-r--r-- | secure/libexec/telnetd/sys_term.c | 14 |
3 files changed, 30 insertions, 12 deletions
diff --git a/eBones/libexec/telnetd/sys_term.c b/eBones/libexec/telnetd/sys_term.c index 1f97554acf40..20ccc453cf70 100644 --- a/eBones/libexec/telnetd/sys_term.c +++ b/eBones/libexec/telnetd/sys_term.c @@ -1833,10 +1833,16 @@ scrub_env() register char **cpp, **cpp2; for (cpp2 = cpp = environ; *cpp; cpp++) { - if (!strncmp(*cpp, "LD_", 3) && - !strncmp(*cpp, "_RLD_", 5) && - !strncmp(*cpp, "LIBPATH=", 8) && - !strncmp(*cpp, "IFS=", 4)) +#ifdef __FreeBSD__ + if (strncmp(*cpp, "LD_LIBRARY_PATH=", 16) && + strncmp(*cpp, "LD_NOSTD_PATH=", 14) && + strncmp(*cpp, "LD_PRELOAD=", 11) && +#else + if (strncmp(*cpp, "LD_", 3) && + strncmp(*cpp, "_RLD_", 5) && + strncmp(*cpp, "LIBPATH=", 8) && +#endif + strncmp(*cpp, "IFS=", 4)) *cpp2++ = *cpp; } *cpp2 = 0; diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c index 79b9313a0776..2e3e4d2e6b90 100644 --- a/libexec/telnetd/sys_term.c +++ b/libexec/telnetd/sys_term.c @@ -1780,10 +1780,16 @@ scrub_env() register char **cpp, **cpp2; for (cpp2 = cpp = environ; *cpp; cpp++) { - if (!strncmp(*cpp, "LD_", 3) && - !strncmp(*cpp, "_RLD_", 5) && - !strncmp(*cpp, "LIBPATH=", 8) && - !strncmp(*cpp, "IFS=", 4)) +#ifdef __FreeBSD__ + if (strncmp(*cpp, "LD_LIBRARY_PATH=", 16) && + strncmp(*cpp, "LD_NOSTD_PATH=", 14) && + strncmp(*cpp, "LD_PRELOAD=", 11) && +#else + if (strncmp(*cpp, "LD_", 3) && + strncmp(*cpp, "_RLD_", 5) && + strncmp(*cpp, "LIBPATH=", 8) && +#endif + strncmp(*cpp, "IFS=", 4)) *cpp2++ = *cpp; } *cpp2 = 0; diff --git a/secure/libexec/telnetd/sys_term.c b/secure/libexec/telnetd/sys_term.c index 1f97554acf40..20ccc453cf70 100644 --- a/secure/libexec/telnetd/sys_term.c +++ b/secure/libexec/telnetd/sys_term.c @@ -1833,10 +1833,16 @@ scrub_env() register char **cpp, **cpp2; for (cpp2 = cpp = environ; *cpp; cpp++) { - if (!strncmp(*cpp, "LD_", 3) && - !strncmp(*cpp, "_RLD_", 5) && - !strncmp(*cpp, "LIBPATH=", 8) && - !strncmp(*cpp, "IFS=", 4)) +#ifdef __FreeBSD__ + if (strncmp(*cpp, "LD_LIBRARY_PATH=", 16) && + strncmp(*cpp, "LD_NOSTD_PATH=", 14) && + strncmp(*cpp, "LD_PRELOAD=", 11) && +#else + if (strncmp(*cpp, "LD_", 3) && + strncmp(*cpp, "_RLD_", 5) && + strncmp(*cpp, "LIBPATH=", 8) && +#endif + strncmp(*cpp, "IFS=", 4)) *cpp2++ = *cpp; } *cpp2 = 0; |