Merge branch 'jb54606' into 'master'

[settings-vpn] Support block-ipv6 in OpenVPN provisioning. JB#54606

See merge request mer-core/nemo-qml-plugin-systemsettings!177

Author: LaakkonenJussi

src/settingsvpnmodel.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2019 Jolla Ltd.
+ * Copyright (c) 2016 - 2021 Jolla Ltd.
  * Copyright (c) 2019 Open Mobile Platform LLC.
  *
  * You may use this file under the terms of the BSD license as follows:
@@ -834,6 +834,10 @@ QVariantMap SettingsVpnModel::processOpenVpnProvisioningFile(QFile &provisioning
                 } else if (directive == QStringLiteral("connect-retry-max")) {
                     // Ignore, must not be set with ConnMan
                     qInfo() << "Ignoring connect-retry-max with OpenVPN";
+                } else if (directive == QStringLiteral("block-ipv6")) {
+                     if (!arguments.isEmpty()) {
+                         rv.insert(QStringLiteral("OpenVPN.BlockIPv6"), arguments.join(QChar(' ')));
+                     }
                 } else {
                     // A directive that ConnMan does not care about - pass through to the config file
                     extraOptions.append(line);