Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable UTMPX support for now, because ftpd might chroot and we need

Browse Source 
to keep files open.
This commit is contained in:
christos 2002-08-20 13:55:58 +00:00
parent 4b476b1883
commit c0b21fbbf7
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/ftpd/Makefile
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.47 2002/08/19 13:54:34 lukem Exp $
# $NetBSD: Makefile,v 1.48 2002/08/20 13:55:58 christos Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
.include <bsd.obj.mk>
PROG= ftpd
SRCS= cmds.c conf.c ftpd.c ftpcmd.y logutmp.c logwtmp.c popen.c
CPPFLAGS+=-I${.CURDIR}
CPPFLAGS+=-I${.CURDIR} -DSUPPORT_UTMP
DPADD+= ${LIBCRYPT} ${LIBUTIL}
LDADD+= -lcrypt -lutil
MAN= ftpd.conf.5 ftpusers.5 ftpd.8

17
libexec/ftpd/ftpd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ftpd.c,v 1.140 2002/08/20 13:51:09 christos Exp $ */
/* $NetBSD: ftpd.c,v 1.141 2002/08/20 13:55:58 christos Exp $ */
/*
* Copyright (c) 1997-2001 The NetBSD Foundation, Inc.
@ -109,7 +109,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: ftpd.c,v 1.140 2002/08/20 13:51:09 christos Exp $");
__RCSID("$NetBSD: ftpd.c,v 1.141 2002/08/20 13:55:58 christos Exp $");
#endif
#endif /* not lint */
@ -155,7 +155,12 @@ __RCSID("$NetBSD: ftpd.c,v 1.140 2002/08/20 13:51:09 christos Exp $");
#include <tzfile.h>
#include <unistd.h>
#include <util.h>
#ifdef SUPPORT_UTMP
#include <utmp.h>
#endif
#ifdef SUPPORT_UTMPX
#include <utmpx.h>
#endif
#ifdef SKEY
#include <skey.h>
#endif
@ -184,7 +189,12 @@ int mapped; /* IPv4 connection on AF_INET6 socket */
off_t file_size;
off_t byte_count;
static char ttyline[20];
#ifdef SUPPORT_UTMP
static struct utmp utmp; /* for utmp */
#endif
#ifdef SUPPORT_UTMPX
static struct utmpx utmpx; /* for utmpx */
#endif
static const char *anondir = NULL;
static const char *confdir = _DEFAULT_CONFDIR;
@ -237,6 +247,7 @@ static enum send_status
static enum send_status
send_data_with_mmap(int, int, const struct stat *, int);
static void logrusage(const struct rusage *, const struct rusage *);
static void logout_utmp(void);
int main(int, char *[]);
@ -2386,7 +2397,7 @@ dologout(int status)
* back to the main program loop.
*/
transflag = 0;
logout_wtmp();
logout_utmp();
if (logged_in) {
#ifdef KERBEROS
if (!notickets && krbtkfile_env)