From aae42a27ac52ae2d5d86b2a6b4f0ccdcdf58c78d Mon Sep 17 00:00:00 2001 From: millert Date: Sun, 25 Oct 2015 23:10:53 +0000 Subject: [PATCH] No longer create /var/run/ftpd.pid in daemon mode; OK jung@ jca@ --- libexec/ftpd/ftpd.8 | 8 +++----- libexec/ftpd/ftpd.c | 6 +----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index 6ef51587906..53780b63aeb 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftpd.8,v 1.74 2015/10/19 19:08:44 schwarze Exp $ +.\" $OpenBSD: ftpd.8,v 1.75 2015/10/25 23:10:53 millert Exp $ .\" $NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $ .\" .\" Copyright (c) 1985, 1988, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" -.Dd $Mdocdate: October 19 2015 $ +.Dd $Mdocdate: October 25 2015 $ .Dt FTPD 8 .Os .Sh NAME @@ -518,7 +518,7 @@ variables and .Va net.inet.ip.porthilast . .Sh FILES -.Bl -tag -width /var/run/ftpd.pid -compact +.Bl -tag -width /etc/ftpwelcome -compact .It Pa /etc/ftpchroot list of normal users who should be chrooted .It Pa /etc/ftpusers @@ -535,8 +535,6 @@ displayed and access refused log file for anonymous downloads .It Pa /var/log/wtmp login account records -.It Pa /var/run/ftpd.pid -process ID if running in daemon mode .It Pa /var/run/utmp list of users on the system .El diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 533212ebaa7..dc0da3097e4 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.209 2015/10/04 11:58:09 tedu Exp $ */ +/* $OpenBSD: ftpd.c,v 1.210 2015/10/25 23:10:53 millert Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -96,7 +96,6 @@ #include #include #include -#include #include #include @@ -479,9 +478,6 @@ main(int argc, char *argv[]) exit(1); } - /* Stash pid in pidfile */ - if (pidfile(NULL)) - syslog(LOG_ERR, "can't open pidfile: %m"); /* * Loop forever accepting connection requests and forking off * children to handle them. -- 2.20.1