[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 42dbdb2088b7877ad1626d19db47089e07996b37

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2589 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  42dbdb2088b7877ad1626d19db47089e07996b37 (commit)
      from  59cbe38697db109f4860e1117b8307b588957b6c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 42dbdb2088b7877ad1626d19db47089e07996b37
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jan 9 12:43:39 2014 +0100

    OpenVPN converter: Fix coding style and verbose output.

-----------------------------------------------------------------------

Summary of changes:
 src/scripts/convert-ovpn | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

Difference in files:
diff --git a/src/scripts/convert-ovpn b/src/scripts/convert-ovpn
index 1e99bce..58921a5 100755
--- a/src/scripts/convert-ovpn
+++ b/src/scripts/convert-ovpn
@@ -27,25 +27,34 @@
 #                                                                             #
 ###############################################################################
 
+require '/var/ipfire/general-functions.pl';
+
 my %configovpn=();
 my $ccdpath="/var/ipfire/ovpn/ccd/";
 my $ovpnconfig="/var/ipfire/ovpn/ovpnconfig";
-require '/var/ipfire/general-functions.pl';
 
 &General::readhasharray ($ovpnconfig,\%configovpn);
 
-&check_config;
+&check_config();
 
+sub check_config {
+	print "Converting CCD files...\n";
+	chdir($ccdpath);
 
-sub check_config
-{
-	print "\n";
 	foreach my $key (sort keys %configovpn){
-		if ($configovpn{$key}[3] eq 'host' && $configovpn{$key}[2]=~" "){
-			my $ccdname=$configovpn{$key}[2];
-			$ccdname =~ tr/ /_/;
-			chdir($ccdpath);
-			rename($ccdname,$configovpn{$key}[2]);
+		# Skip everything else but roadwarrior connections.
+		next if ($configovpn{$key}[3] ne 'host');
+
+		# Skip all connections with no space in the CN name.
+		next if ($configovpn{$key}[2] !~ " ");
+
+		my $ccdname = $configovpn{$key}[2];
+		$ccdname =~ tr/ /_/;
+
+		# Rename the CCD file if one with the old format exists.
+		if (-e "$ccdname") {
+			print " Renaming $ccdname -> $configovpn{$key}[2]...\n";
+			rename($ccdname, $configovpn{$key}[2]);
 		}
 	}
 }


hooks/post-receive
--
IPFire 2.x development tree