===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.46.4.1
retrieving revision 1.47
diff -c -r1.46.4.1 -r1.47
*** src/usr.bin/telnet/commands.c	2005/03/29 19:49:10	1.46.4.1
--- src/usr.bin/telnet/commands.c	2004/11/17 01:47:20	1.47
***************
*** 1,4 ****
! /*	$OpenBSD: commands.c,v 1.46.4.1 2005/03/29 19:49:10 brad Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$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,1833 ****
  }
  
  	unsigned char *
! env_getvalue(var, exported_only)
  	unsigned char *var;
- 	int exported_only;
  {
  	struct env_lst *ep;
  
! 	if ((ep = env_find(var)) && (!exported_only || ep->export))
  		return(ep->value);
  	return(NULL);
  }
--- 1821,1832 ----
  }
  
  	unsigned char *
! env_getvalue(var)
  	unsigned char *var;
  {
  	struct env_lst *ep;
  
! 	if ((ep = env_find(var)))
  		return(ep->value);
  	return(NULL);
  }
***************
*** 2275,2285 ****
  #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));
--- 2274,2280 ----