From owner-freebsd-bugs@FreeBSD.ORG  Tue Dec  7 22:10:27 2004
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7757716A4CE
	for <freebsd-bugs@hub.freebsd.org>;
	Tue,  7 Dec 2004 22:10:27 +0000 (GMT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5E63443D2D
	for <freebsd-bugs@hub.freebsd.org>;
	Tue,  7 Dec 2004 22:10:27 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iB7MARK4014280
	for <freebsd-bugs@freefall.freebsd.org>; Tue, 7 Dec 2004 22:10:27 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iB7MARbA014279;
	Tue, 7 Dec 2004 22:10:27 GMT
	(envelope-from gnats)
Date: Tue, 7 Dec 2004 22:10:27 GMT
Message-Id: <200412072210.iB7MARbA014279@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: "Alexander Melkov" <melkov@comptek.ru>
Subject: Re: bin/74823: ftpd should not use warn(x) more carefully when used
	from inetd [patch]
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Alexander Melkov <melkov@comptek.ru>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Dec 2004 22:10:27 -0000

The following reply was made to PR bin/74823; it has been noted by GNATS.

From: "Alexander Melkov" <melkov@comptek.ru>
To: <freebsd-gnats-submit@FreeBSD.org>,
	"Alexander Melkov" <melkov@comptek.ru>
Cc:  
Subject: Re: bin/74823: ftpd should not use warn(x) more carefully when used from inetd [patch]
Date: Wed, 8 Dec 2004 01:04:39 +0300

 I'm sorry, my previous patch was slightly inaccurate.
 Because ftpd uses compiled-in ls, which in turn uses warn(x) in correct way,
 __progname should be restored
 
 Correct patch:
 diff ftpd.c.1.163 ftpd.c
 286a287,288
 >       struct stat st;
 >       char *old_progname = NULL;
 291a294,299
 >       if (fstat(0, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) {
 >               extern char *__progname;
 >               old_progname = __progname;
 >               __progname = "220-";
 >       }
 >
 422a431,434
 >       if (old_progname) {
 >               extern char *__progname;
 >               __progname = old_progname;
 >       }