cvs commit: ports/security/vpnc Makefile ports/security/vpnc/files vpnc.in vpnc.sh

[Doug Barton]

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
-------------- next part --------------
--- 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.