From 234e6442144820832667b476881c512754cb3141 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Fri, 8 Dec 2000 23:32:06 +0000
Subject: [PATCH] (scrub_env): add supporting non-file TERMCAP variables

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9324 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/telnetd/sys_term.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c
index eba775eb1..31bf0175a 100644
--- a/appl/telnet/telnetd/sys_term.c
+++ b/appl/telnet/telnetd/sys_term.c
@@ -1211,11 +1211,15 @@ init_env(void)
  *
  * We only accept the environment variables listed below.
  */
- */
 
 static void
 scrub_env(void)
 {
+    static const char *reject[] = {
+	"TERMCAP=/",
+	NULL
+    };
+
     static const char *accept[] = {
 	"XAUTH=", "XAUTHORITY=", "DISPLAY=",
 	"TERM=",
@@ -1224,6 +1228,7 @@ scrub_env(void)
 	"PRINTER=",
 	"LOGNAME=",
 	"POSIXLY_CORRECT=",
+	"TERMCAP=",
 	NULL
     };
 
@@ -1231,6 +1236,16 @@ scrub_env(void)
     const char **p;
   
     for (cpp2 = cpp = environ; *cpp; cpp++) {
+	int reject_it = 0;
+
+	for(p = reject; *p; p++)
+	    if(strncmp(*cpp, *p, strlen(*p)) == 0) {
+		reject_it = 1;
+		break;
+	    }
+	if (reject_it)
+	    continue;
+
 	for(p = accept; *p; p++)
 	    if(strncmp(*cpp, *p, strlen(*p)) == 0)
 		break;