*** appl/telnet/telnetd/utility.c.ORIG	Fri Feb  6 19:41:48 1998
--- appl/telnet/telnetd/utility.c	Tue Jun 30 19:46:02 1998
***************
*** 33,38 ****
--- 33,42 ----
  
  /* based on @(#)utility.c	8.1 (Berkeley) 6/4/93 */
  
+ #ifdef HAVE_SYS_UTSNAME_H
+ #include <sys/utsname.h>
+ #endif
+ 
  #define PRINTOPTIONS
  #include "telnetd.h"
  
***************
*** 448,453 ****
--- 452,463 ----
  	char *slash;
  	time_t t;
  	char db[100];
+ #ifdef HAVE_SYS_UTSNAME_H
+ 	struct utsname utsinfo;
+ 
+ 	(void) uname(&utsinfo);
+ #endif
+ 
  
  	putlocation = where;
  
***************
*** 484,489 ****
--- 494,517 ----
  		case '%':
  			putchr('%');
  			break;
+ 
+ #ifdef HAVE_SYS_UTSNAME_H
+ 		case 's':
+ 			putstr(utsinfo.sysname);
+ 			break;
+ 
+ 		case 'm':
+ 			putstr(utsinfo.machine);
+ 			break;
+ 
+ 		case 'r':
+ 			putstr(utsinfo.release);
+ 			break;
+ 
+ 		case 'v':
+ 			putstr(utsinfo.version);
+ 			break;
+ #endif
  		}
  		cp++;
  	}
