From owner-freebsd-bugs  Sun Sep 22 11:10:05 1996
Return-Path: owner-bugs
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id LAA01409
          for bugs-outgoing; Sun, 22 Sep 1996 11:10:05 -0700 (PDT)
Received: (from gnats@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id LAA01380;
          Sun, 22 Sep 1996 11:10:02 -0700 (PDT)
Resent-Date: Sun, 22 Sep 1996 11:10:02 -0700 (PDT)
Resent-Message-Id: <199609221810.LAA01380@freefall.freebsd.org>
Resent-From: gnats (GNATS Management)
Resent-To: freebsd-bugs
Resent-Reply-To: FreeBSD-gnats@freefall.FreeBSD.org,
        pjchilds@imforei.apana.org.au
Received: from al.imforei.apana.org.au (pjchilds@al.imforei.apana.org.au [202.12.89.41])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id LAA26997
          for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Sep 1996 11:03:14 -0700 (PDT)
Received: (from pjchilds@localhost) by al.imforei.apana.org.au (8.7.6/8.7.3) id DAA09397; Mon, 23 Sep 1996 03:33:08 +0930 (CST)
Message-Id: <199609221803.DAA09397@al.imforei.apana.org.au>
Date: Mon, 23 Sep 1996 03:33:08 +0930 (CST)
From: Peter Childs <pjchilds@imforei.apana.org.au>
Reply-To: pjchilds@imforei.apana.org.au
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: bin/1665: libexec-telnetd deficiency
Sender: owner-bugs@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk


>Number:         1665
>Category:       bin
>Synopsis:       telnetd doesn't use gettytab %m %r %v %s tags
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 22 11:10:02 PDT 1996
>Last-Modified:
>Originator:     Peter Childs
>Organization:
Peter Childs  ---  http://www.imforei.apana.org.au/~pjchilds
  Finger pjchilds@al.imforei.apana.org.au for public PGP key
         Drag me, drop me, treat me like an object!
>Release:        FreeBSD 2.2-CURRENT i386
>Environment:

	2.2-current

>Description:

	Whilst reading discussion on one of the lists about
	/etc/issue vs. gettydefs I tried to modify my gettydefs so
	that logins displaced system info etc.

	This is the second patch that fixes telnetd so it supports
	%m %r %v %s tags as documented in gettytab.5

>How-To-Repeat:

	Adjust /etc/gettytab and find that nothing uses it.

>Fix:
	
	Apply patch to telnetd...

*** defs.h.orig	Mon Sep 23 03:18:11 1996
--- defs.h	Mon Sep 23 03:18:38 1996
***************
*** 78,83 ****
--- 78,84 ----
  #include <sys/file.h>
  #include <sys/stat.h>
  #include <sys/time.h>
+ #include <sys/utsname.h>
  #ifndef	FILIO_H
  #include <sys/ioctl.h>
  #else
*** telnetd.c.orig	Mon Sep 23 03:06:47 1996
--- telnetd.c	Mon Sep 23 03:23:19 1996
***************
*** 115,120 ****
--- 115,121 ----
  #endif /* ! STREAMPTY */
  
  int	hostinfo = 1;			/* do we print login banner? */
+ struct  utsname kerninfo;		/* banner info */
  
  #ifdef	CRAY
  extern int      newmap; /* nonzero if \n maps to ^M^J */
***************
*** 1071,1076 ****
--- 1072,1078 ----
  	if (getenv("USER"))
  		hostinfo = 0;
  #endif
+ 	uname(&kerninfo);
  
  	if (getent(defent, "default") == 1) {
  		char *getstr();
*** utility.c.orig	Mon Sep 23 03:02:49 1996
--- utility.c	Mon Sep 23 03:22:00 1996
***************
*** 41,46 ****
--- 41,48 ----
  #define PRINTOPTIONS
  #include "telnetd.h"
  
+ extern struct  utsname kerninfo; 
+ 
  /*
   * utility functions performing io related tasks
   */
***************
*** 460,465 ****
--- 462,483 ----
  			(void)time(&t);
  			(void)strftime(db, sizeof(db), fmtstr, localtime(&t));
  			putstr(db);
+ 			break;
+ 
+ 		case 's':
+ 			putstr(kerninfo.sysname);
+ 			break;
+ 
+ 		case 'm':
+ 			putstr(kerninfo.machine);
+ 			break;
+ 
+ 		case 'r':
+ 			putstr(kerninfo.release);
+ 			break;
+ 
+ 		case 'v':
+ 			putstr(kerninfo.version);
  			break;
  
  		case '%':
>Audit-Trail:
>Unformatted: