From owner-cvs-all@FreeBSD.ORG Wed Feb 28 20:00:10 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CB1C316A40B for ; Wed, 28 Feb 2007 20:00:10 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx24.fluidhosting.com [204.14.89.7]) by mx1.freebsd.org (Postfix) with SMTP id 16D8213C4B6 for ; Wed, 28 Feb 2007 20:00:09 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 27640 invoked by uid 399); 28 Feb 2007 20:00:08 -0000 Received: from localhost (HELO ?192.168.0.4?) (dougb@dougbarton.us@127.0.0.1) by localhost with SMTP; 28 Feb 2007 20:00:08 -0000 X-Originating-IP: 127.0.0.1 Message-ID: <45E5DF45.6010407@FreeBSD.org> Date: Wed, 28 Feb 2007 12:00:05 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0b2 (Windows/20070116) MIME-Version: 1.0 To: Gabor Kovesdan References: <200702261857.l1QIvVMT051664@repoman.freebsd.org> <45E3701E.9000900@FreeBSD.org> <45E5C97A.6060401@FreeBSD.org> In-Reply-To: <45E5C97A.6060401@FreeBSD.org> X-Enigmail-Version: 0.94.2.0 Content-Type: multipart/mixed; boundary="------------090309060604090302030002" Cc: Dominic Fandrey , cvs-all@FreeBSD.org, ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, erwin@freebsd.org, Christian Lackas Subject: Re: cvs commit: ports/security/vpnc Makefile ports/security/vpnc/files vpnc.in vpnc.sh X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2007 20:00:10 -0000 This is a multi-part message in MIME format. --------------090309060604090302030002 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Gabor Kovesdan wrote: > Hello, > > thanks for pointing these out. Could you check the patch at > http://gabor.t-hosting.hu/patches/security-vpnc.diff to make sure I got > all your points correctly? While here, I changed the wrapping a bit to > make it easier to read. > Christian, do you approve these changes suggested by Doug? No problem, glad to help. I have just a couple small suggestions in the attached patch. First, it's ok (and you probably should) have the shutdown KEYWORD in there. It's the FreeBSD KEYWORD that is obsolete. The few other changes are mostly whitespace, and the removal of now obsolete code at the end of _start(). Please test this thoroughly before committing. Regards, Doug -- This .signature sanitized for your protection --------------090309060604090302030002 Content-Type: text/plain; name="vpnc.dougb.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="vpnc.dougb.diff" --- vpnc.in.patched Wed Feb 28 10:11:37 2007 +++ vpnc.in Wed Feb 28 10:10:53 2007 @@ -12,6 +12,7 @@ # PROVIDE: vpnc # REQUIRE: LOGIN +# KEYWORD: shutdown # Default settings - don't change this. : ${vpnc_enable="NO"} @@ -38,12 +39,10 @@ for config in $vpnc_conf; do - # The current configuration file. - + # The current configuration file. current="$vpnc_conf_dir/$config" - # Start vpnc. - + # Start vpnc. if ! $command $current $vpnc_flags; then status=$? echo "Running 'vpnc $current $vpnc_flags' failed." @@ -60,12 +59,7 @@ # Wait for the system to catch up. /bin/sleep 1 - done - else - # No configuration files given, run unmanaged. - $command $vpnc_flags - return $? - fi + done } vpnc_stop() { @@ -94,8 +88,7 @@ # Run the disconnect command. $command-disconnect - - done + done # Remove the connection record. --------------090309060604090302030002--