Merge remote-tracking branch 'amarx/BUG10834' into next

diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert
index 7aa8cf13ea42106ce2abba086b6d7ce886fcfbb9..f4967065622303c463c0e5b68c3cb2aa7ac08768 100644 (file)
--- a/src/scripts/ovpn-ccd-convert
+++ b/src/scripts/ovpn-ccd-convert
@@ -42,7 +42,7 @@ 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')