===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/telnet/commands.c	1999/07/20 12:50:33	1.21
--- src/usr.bin/telnet/commands.c	1999/12/07 01:10:29	1.22
***************
*** 1,4 ****
! /*	$OpenBSD: commands.c,v 1.21 1999/07/20 12:50:33 deraadt Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: commands.c,v 1.22 1999/12/07 01:10:29 deraadt Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
***************
*** 2289,2296 ****
  
      if (connected) {
  	printf("?Already connected to %s\r\n", hostname);
- 	seteuid(getuid());
- 	setuid(getuid());
  	return 0;
      }
      if (argc < 2) {
--- 2289,2294 ----
***************
*** 2340,2347 ****
  	}
      usage:
  	printf("usage: %s [-l user] [-a] host-name [port]\r\n", cmd);
- 	seteuid(getuid());
- 	setuid(getuid());
  	return 0;
      }
      if (hostp == 0)
--- 2338,2343 ----
***************
*** 2356,2368 ****
  	temp = sourceroute(hostp, &srp, &srlen);
  	if (temp == 0) {
  	    herror(srp);
- 	    seteuid(getuid());
- 	    setuid(getuid());
  	    return 0;
  	} else if (temp == -1) {
  	    printf("Bad source route option: %s\r\n", hostp);
- 	    seteuid(getuid());
- 	    setuid(getuid());
  	    return 0;
  	} else {
  	    abort();
--- 2352,2360 ----
***************
*** 2425,2432 ****
  		    hostname = _hostname;
  		} else {
  		    herror(hostp);
- 		    seteuid(getuid());
- 		    setuid(getuid());
  		    return 0;
  		}
  	    }
--- 2417,2422 ----
***************
*** 2446,2453 ****
  		port = sp->s_port;
  	    else {
  		printf("%s: bad port number\r\n", portp);
- 		seteuid(getuid());
- 		setuid(getuid());
  		return 0;
  	    }
  	} else {
--- 2436,2441 ----
***************
*** 2458,2465 ****
  	    sp = getservbyname("telnet", "tcp");
  	    if (sp == 0) {
  		fprintf(stderr, "telnet: tcp/telnet: unknown service\r\n");
- 		seteuid(getuid());
- 		setuid(getuid());
  		return 0;
  	    }
  	    port = sp->s_port;
--- 2446,2451 ----
***************
*** 2495,2502 ****
  
      do {
  	net = socket(family, SOCK_STREAM, 0);
- 	seteuid(getuid());
- 	setuid(getuid());
  	if (net < 0) {
  	    perror("telnet: socket");
  	    return 0;
--- 2481,2486 ----