===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.46.2.1
retrieving revision 1.47
diff -u -r1.46.2.1 -r1.47
--- src/usr.bin/telnet/commands.c	2005/03/29 20:20:10	1.46.2.1
+++ src/usr.bin/telnet/commands.c	2004/11/17 01:47:20	1.47
@@ -1,4 +1,4 @@
-/*	$OpenBSD: commands.c,v 1.46.2.1 2005/03/29 20:20:10 brad Exp $	*/
+/*	$OpenBSD: commands.c,v 1.47 2004/11/17 01:47:20 itojun Exp $	*/
 /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
 
 /*
@@ -1821,13 +1821,12 @@
 }
 
 	unsigned char *
-env_getvalue(var, exported_only)
+env_getvalue(var)
 	unsigned char *var;
-	int exported_only;
 {
 	struct env_lst *ep;
 
-	if ((ep = env_find(var)) && (!exported_only || ep->export))
+	if ((ep = env_find(var)))
 		return(ep->value);
 	return(NULL);
 }
@@ -2275,11 +2274,7 @@
 #endif
     char *cmd, *hostp = 0, *portp = 0, *user = 0, *aliasp = 0;
     int retry;
-#ifdef NI_WITHSCOPEID
-    const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
     const int niflags = NI_NUMERICHOST;
-#endif
 
     /* clear the socket address prior to use */
     memset((char *)&sin, 0, sizeof(sin));