X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Fscripts%2Fovpn-ccd-convert;h=f4967065622303c463c0e5b68c3cb2aa7ac08768;hp=c54e256a2d18f76b41b838c6c5e3c5605aa3c4ea;hb=d9c6f56c2ea171cbc1fa396feb30d2814b9a818d;hpb=1d0fcb09edd3929dda72d23afd3a8d16f7713794

diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert
index c54e256a2d..f496706562 100644
--- a/src/scripts/ovpn-ccd-convert
+++ b/src/scripts/ovpn-ccd-convert
@@ -31,6 +31,7 @@ open(FILE,"/var/ipfire/ovpn/server.conf");
 &General::readhasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig);
 foreach my $key (keys %ovpnconfig){
 	if($ovpnconfig{$key}[32] eq '' && $ovpnconfig{$key}[3] eq 'host'){
+		$ovpnconfig{$key}[2] =~ s/ /_/gi;
 		open ( CCDRWCONF,'>',"/var/ipfire/ovpn/ccd/$ovpnconfig{$key}[2]") or die "Unable to create clientconfigfile $!";
 		print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n";
 		print CCDRWCONF "#This client uses the dynamic pool\n\n";
@@ -41,10 +42,11 @@ foreach my $key (keys %ovpnconfig){
 	}else{
 		print "Client $ovpnconfig{$key}[2] NOT converted!\n";
 	}
-	$ovpnconfig{$key}[32] = 'dynamic';
+	$ovpnconfig{$key}[32] = 'dynamic' if ($ovpnconfig{$key}[32] eq '');
 }
 &General::writehasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig);
 if ($running eq 'on')
 {
 	system('/usr/local/bin/openvpnctrl', '-s');
 }
+system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*");