>Number:         2217
>Category:       bin
>Synopsis:       ftpd should manage utmp entries for connections
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bin-bug-people (Utility Bug People)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Mar 15 04:35:01 1996
>Last-Modified:
>Originator:     Jason Downs
>Organization:
Jason Downs
downsj@teeny.org  --> teeny.org: Free Software for a Free Internet <--
http://www.teeny.org/

			  Big Brother... Just say No.
	      No to unlimited wiretaps.  No to enforced `decency'.
>Release:        NetBSD-current
>Environment:
	
System: NetBSD threadway 1.1A NetBSD 1.1A (THREADWAY) #10: Tue Mar 12 18:51:11 PST 1996 downsj@threadway:/usr/src/sys/arch/i386/compile/THREADWAY i386


>Description:
	Those that run anonymous FTP sites especially often find it
	useful if ftpd manages utmp entries for it's connections, in
	addition to the wtmp log entries.  This makes it easier to tell
	if someone is logged in to ftp, etc.

	Someone asked about this feature on one of the mailing lists, so
	I cleaned up what I had.  This adds the -U uption to ftpd, making
	utmp management an option.

	ftpd handles utmp by finding the last possible `ttyslot' and using
	that.  It uses it's own versions of libutil interfaces, adding the
	file logutmp.c.
>How-To-Repeat:
	
>Fix:
*** orig/Makefile	Fri Feb 16 04:32:02 1996
--- Makefile	Fri Mar 15 01:10:53 1996
***************
*** 3,9 ****
  
  PROG=	ftpd
  CFLAGS+=-DHASSETPROCTITLE -DSKEY -Dunix
! SRCS=	ftpd.c ftpcmd.c logwtmp.c popen.c
  MAN=	ftpd.8
  CLEANFILES+=ftpcmd.c y.tab.h
  .PATH:	${.CURDIR}/../../usr.bin/ftp ${.CURDIR}/../../usr.bin/login
--- 3,9 ----
  
  PROG=	ftpd
  CFLAGS+=-DHASSETPROCTITLE -DSKEY -Dunix
! SRCS=	ftpd.c ftpcmd.c logutmp.c logwtmp.c popen.c
  MAN=	ftpd.8
  CLEANFILES+=ftpcmd.c y.tab.h
  .PATH:	${.CURDIR}/../../usr.bin/ftp ${.CURDIR}/../../usr.bin/login
*** orig/ftpd.c	Fri Oct 13 18:05:04 1995
--- ftpd.c	Fri Mar 15 00:59:28 1996
***************
*** 82,87 ****
--- 82,88 ----
  #include <syslog.h>
  #include <time.h>
  #include <unistd.h>
+ #include <utmp.h>
  
  #include "pathnames.h"
  #include "extern.h"
***************
*** 117,122 ****
--- 118,124 ----
  int	form;
  int	stru;			/* avoid C keyword */
  int	mode;
+ int	doutmp = 0;		/* update utmp file */
  int	usedefault = 1;		/* for data transfers */
  int	pdata = -1;		/* for passive mode */
  sig_atomic_t transflag;
***************
*** 132,137 ****
--- 134,140 ----
  char	remotehost[MAXHOSTNAMELEN];
  static char ttyline[20];
  char	*tty = ttyline;		/* for klogin */
+ static struct utmp utmp;	/* for utmp */
  
  #if defined(KERBEROS)
  int	notickets = 1;
***************
*** 235,243 ****
  	debug = 0;
  
  	/* set this here so klogin can use it... */
! 	(void)sprintf(ttyline, "ftp%d", getpid());
  
! 	while ((ch = getopt(argc, argv, "dlt:T:u:v")) != EOF) {
  		switch (ch) {
  		case 'd':
  			debug = 1;
--- 238,246 ----
  	debug = 0;
  
  	/* set this here so klogin can use it... */
! 	(void)snprintf(ttyline, sizeof(ttyline), "ftp%d", getpid());
  
! 	while ((ch = getopt(argc, argv, "dlt:T:u:Uv")) != EOF) {
  		switch (ch) {
  		case 'd':
  			debug = 1;
***************
*** 271,276 ****
--- 274,283 ----
  			break;
  		    }
  
+ 		case 'U':
+ 			doutmp = 1;
+ 			break;
+ 
  		case 'v':
  			debug = 1;
  			break;
***************
*** 521,528 ****
  {
  
  	(void) seteuid((uid_t)0);
! 	if (logged_in)
  		logwtmp(ttyline, "", "");
  	pw = NULL;
  	logged_in = 0;
  	guest = 0;
--- 528,538 ----
  {
  
  	(void) seteuid((uid_t)0);
! 	if (logged_in) {
  		logwtmp(ttyline, "", "");
+ 		if (doutmp)
+ 			logout(utmp.ut_line);
+ 	}
  	pw = NULL;
  	logged_in = 0;
  	guest = 0;
***************
*** 597,602 ****
--- 607,623 ----
  
  	/* open wtmp before chroot */
  	logwtmp(ttyline, pw->pw_name, remotehost);
+ 
+ 	/* open utmp before chroot */
+ 	if (doutmp) {
+ 		memset((void *)&utmp, 0, sizeof(utmp));
+ 		(void)time(&utmp.ut_time);
+ 		(void)strncpy(utmp.ut_name, pw->pw_name, sizeof(utmp.ut_name));
+ 		(void)strncpy(utmp.ut_host, remotehost, sizeof(utmp.ut_host));
+ 		(void)strncpy(utmp.ut_line, ttyline, sizeof(utmp.ut_line));
+ 		login(&utmp);
+ 	}
+ 
  	logged_in = 1;
  
  	dochroot = checkuser(_PATH_FTPCHROOT, pw->pw_name);
***************
*** 1394,1399 ****
--- 1415,1422 ----
  	if (logged_in) {
  		(void) seteuid((uid_t)0);
  		logwtmp(ttyline, "", "");
+ 		if (doutmp)
+ 			logout(utmp.ut_line);
  #if defined(KERBEROS)
  		if (!notickets && krbtkfile_env)
  			unlink(krbtkfile_env);
*** orig/ftpd.8	Mon Jan 15 04:17:34 1996
--- ftpd.8	Fri Mar 15 01:10:08 1996
***************
*** 33,39 ****
  .\"
  .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
  .\"
! .Dd April 19, 1994
  .Dt FTPD 8
  .Os BSD 4.2
  .Sh NAME
--- 33,39 ----
  .\"
  .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
  .\"
! .Dd March 15, 1996
  .Dt FTPD 8
  .Os BSD 4.2
  .Sh NAME
***************
*** 42,50 ****
  Internet File Transfer Protocol server
  .Sh SYNOPSIS
  .Nm ftpd
! .Op Fl dl
  .Op Fl T Ar maxtimeout
  .Op Fl t Ar timeout
  .Sh DESCRIPTION
  .Nm Ftpd
  is the
--- 42,51 ----
  Internet File Transfer Protocol server
  .Sh SYNOPSIS
  .Nm ftpd
! .Op Fl dlU
  .Op Fl T Ar maxtimeout
  .Op Fl t Ar timeout
+ .Op Fl u Ar mask
  .Sh DESCRIPTION
  .Nm Ftpd
  is the
***************
*** 68,73 ****
--- 69,81 ----
  If this option is specified twice, the retrieve (get), store (put), append,
  delete, make directory, remove directory and rename operations and
  their filename arguments are also logged.
+ .It Fl U
+ Each concurrent
+ .Xr ftp 1
+ session is logged to the file
+ .Pa /var/run/utmp ,
+ making them visible to commands such as
+ .Xr who 1 .
  .It Fl T
  A client may also request a different timeout period;
  the maximum period allowed may be set to
***************
*** 80,85 ****
--- 88,96 ----
  The inactivity timeout period is set to
  .Ar timeout
  seconds (the default is 15 minutes).
+ .It Fl u
+ The default umask is set to
+ .Ar mask .
  .El
  .Pp
  The file
***************
*** 296,305 ****
--- 307,319 ----
  Welcome notice after login.
  .It Pa /etc/nologin
  Displayed and access refused.
+ .It Pa /var/run/utmp
+ List of users on the system.
  .El
  .Sh SEE ALSO
  .Xr ftp 1 ,
  .Xr skey 1 ,
+ .Xr who 1 ,
  .Xr getusershell 3 ,
  .Xr syslogd 8
  .Sh BUGS
*** /dev/null	Fri Mar 15 00:54:46 1996
--- logutmp.c	Fri Mar 15 01:18:57 1996
***************
*** 0 ****
--- 1,120 ----
+ /*
+  * Portions Copyright (c) 1988, 1993
+  *	The Regents of the University of California.  All rights reserved.
+  * Portions Copyright (c) 1996, Jason Downs.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+  * are met:
+  * 1. Redistributions of source code must retain the above copyright
+  *    notice, this list of conditions and the following disclaimer.
+  * 2. Redistributions in binary form must reproduce the above copyright
+  *    notice, this list of conditions and the following disclaimer in the
+  *    documentation and/or other materials provided with the distribution.
+  * 3. All advertising materials mentioning features or use of this software
+  *    must display the following acknowledgement:
+  *	This product includes software developed by the University of
+  *	California, Berkeley and its contributors.
+  * 4. Neither the name of the University nor the names of its contributors
+  *    may be used to endorse or promote products derived from this software
+  *    without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  * SUCH DAMAGE.
+  */
+ 
+ #include <sys/types.h>
+ 
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <utmp.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <ttyent.h>
+ 
+ typedef struct utmp UTMP;
+ 
+ static int fd = -1;
+ static int topslot = -1;
+ 
+ /*
+  * Special versions of login()/logout() which hold the utmp file open,
+  * for use with ftpd.
+  */
+ 
+ void
+ login(ut)
+ 	UTMP *ut;
+ {
+ 	UTMP ubuf;
+ 
+ 	/*
+ 	 * First, loop through /etc/ttys, if needed, to initialize the
+ 	 * top of the tty slots, since ftpd has no tty.
+ 	 */
+ 	if (topslot < 0) {
+ 		topslot = 0;
+ 		while (getttyent() != (struct ttyent *)NULL)
+ 			topslot++;
+ 	}
+ 	if ((topslot < 0) || ((fd < 0)
+ 	    && (fd = open(_PATH_UTMP, O_RDWR|O_CREAT, 0644)) < 0))
+ 	    	return;
+ 
+ 	/*
+ 	 * Now find a slot that's not in use...
+ 	 */
+ 	(void)lseek(fd, (off_t)(topslot * sizeof(UTMP)), L_SET);
+ 
+ 	while (1) {
+ 		if (read(fd, &ubuf, sizeof(UTMP)) == sizeof(UTMP)) {
+ 			if (!ubuf.ut_name[0]) {
+ 				(void)lseek(fd, -(off_t)sizeof(UTMP), L_INCR);
+ 				break;
+ 			}
+ 			topslot++;
+ 		} else {
+ 			(void)lseek(fd, (off_t)(topslot * sizeof(UTMP)), L_SET);
+ 			break;
+ 		}
+ 	}
+ 
+ 	(void)write(fd, ut, sizeof(UTMP));
+ }
+ 
+ int
+ logout(line)
+ 	register char *line;
+ {
+ 	UTMP ut;
+ 	int rval;
+ 
+ 	rval = 0;
+ 	if (fd < 0)
+ 		return(rval);
+ 
+ 	(void)lseek(fd, 0, L_SET);
+ 
+ 	while (read(fd, &ut, sizeof(UTMP)) == sizeof(UTMP)) {
+ 		if (!ut.ut_name[0]
+ 		    || strncmp(ut.ut_line, line, UT_LINESIZE))
+ 			continue;
+ 		bzero(ut.ut_name, UT_NAMESIZE);
+ 		bzero(ut.ut_host, UT_HOSTSIZE);
+ 		(void)time(&ut.ut_time);
+ 		(void)lseek(fd, -(off_t)sizeof(UTMP), L_INCR);
+ 		(void)write(fd, &ut, sizeof(UTMP));
+ 		rval = 1;
+ 	}
+ 	return(rval);
+ }
>Audit-Trail:
>Unformatted: