From jhelfman@e-e.com  Thu May 13 22:31:51 2010
Return-Path: <jhelfman@e-e.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3BF1106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 May 2010 22:31:51 +0000 (UTC)
	(envelope-from jhelfman@e-e.com)
Received: from mail.experts-exchange.com (mail.experts-exchange.com [64.156.132.251])
	by mx1.freebsd.org (Postfix) with ESMTP id C1C088FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 May 2010 22:31:51 +0000 (UTC)
Received: from eggman.experts-exchange.com (unknown [72.29.180.81])
	by mail.experts-exchange.com (Postfix) with ESMTP id 544214A2E6E5
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 May 2010 15:31:25 -0700 (PDT)
Received: by eggman.experts-exchange.com (sSMTP sendmail emulation); Thu, 13 May 2010 15:29:53 -0700
Message-Id: <20100513223125.544214A2E6E5@mail.experts-exchange.com>
Date: Thu, 13 May 2010 15:29:53 -0700
From: Jason Helfman <jhelfman@e-e.com>
Reply-To: Jason Helfman <jhelfman@e-e.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] ftp/vsftpd rc script doesn't support vsftpd_flags
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         146556
>Category:       ports
>Synopsis:       [patch] ftp/vsftpd rc script doesn't support vsftpd_flags
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 13 22:40:04 UTC 2010
>Closed-Date:    Sat Aug 07 10:51:01 CEST 2010
>Last-Modified:  Sat Aug 07 10:51:01 CEST 2010
>Originator:     Jason Helfman
>Release:        FreeBSD 7.2-RELEASE-p7 i386
>Organization:
Experts-Exchange
>Environment:
System: FreeBSD eggman.experts-exchange.com 7.2-RELEASE-p7 FreeBSD 7.2-RELEASE-p7 #0: Fri Feb 26 19:51:57 UTC 2010 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


>Description:
If vsftpd_flags is set in /etc/rc.conf to use a different configuration file, it will fail, as it is only considering the required default file in precmd.
>How-To-Repeat:
Add port ftp/vsftpd
cp default /usr/local/etc/vsftpd.conf to /usr/local/etc/vsftpd_test.conf
add vsftpd_enable="YES" to /etc/rc.conf
add vsftpd_flags="/usr/local/etc/vsftpd_test.conf"
run /usr/local/etc/rc.d/vsftpd start

>Fix:

--- /usr/ports/ftp/vsftpd/files/vsftpd.sh.in	2010-03-26 17:13:02.000000000 -0700
+++ /usr/ports/ftp/vsftpd/files/vsftpd.sh.in	2010-05-13 14:52:58.000000000 -0700
@@ -29,11 +29,16 @@
 : ${vsftpd_enable:="NO"}
 
 command="%%PREFIX%%/libexec/$name"
-required_files="%%PREFIX%%/etc/$name.conf"
 start_precmd="vsftpd_check"
 
 vsftpd_check()
 {
+	if  [ -z ${vsftpd_flags} ]; then
+		required_files="%%PREFIX%%/etc/$name.conf"
+        else 
+		required_files="${vsftpd_flags}"
+	fi
+
 	if grep -q "^ftp[ 	]" /etc/inetd.conf ${required_files}
 	then
 		err 1 "ftp is already activated in /etc/inetd.conf"
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu May 13 22:40:14 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146556 
State-Changed-From-To: open->feedback 
State-Changed-By: dinoex 
State-Changed-When: Tue May 18 06:51:09 CEST 2010 
State-Changed-Why:  

Please improve 

your patch does not anlde option set wirthout specify the config. 
e.g: 

vsftpd_flags="-oftpd_banner=blah" 


http://www.freebsd.org/cgi/query-pr.cgi?pr=146556 
State-Changed-From-To: feedback->closed 
State-Changed-By: dinoex 
State-Changed-When: Sun Jul 18 13:43:02 CEST 2010 
State-Changed-Why:  
- problem not reproduceable here 
- no feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146556 
State-Changed-From-To: closed->analyzed 
State-Changed-By: dinoex 
State-Changed-When: Sun Jul 18 13:48:08 CEST 2010 
State-Changed-Why:  

I think of reworking the rc.d file. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=146556 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146556: commit references a PR
Date: Sat,  7 Aug 2010 07:49:26 +0000 (UTC)

 dinoex      2010-08-07 07:49:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     ftp/vsftpd           Makefile distinfo 
     ftp/vsftpd/files     vsftpd.sh.in 
   Added files:
     ftp/vsftpd/files     pidfile.patch 
   Log:
   - rc.d supports now vsftpd_config
   PR:             146556
   
   - new option WITH_PIDFILE
   Submitted by:   Eugen Zagorodniy
   
   - update to 2.3.0
   
   Revision  Changes    Path
   1.41      +7 -2      ports/ftp/vsftpd/Makefile
   1.23      +3 -3      ports/ftp/vsftpd/distinfo
   1.1       +87 -0     ports/ftp/vsftpd/files/pidfile.patch (new)
   1.12      +8 -6      ports/ftp/vsftpd/files/vsftpd.sh.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: analyzed->closed 
State-Changed-By: dinoex 
State-Changed-When: Sat Aug 7 10:50:30 CEST 2010 
State-Changed-Why:  
a fix is committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146556 
>Unformatted:
