[l2tp] Fix PPPD noipv6 option use. JB#54605

connman/vpn/plugins/l2tp.c

@@ -387,7 +387,7 @@ static int write_pppd_option(struct vpn_provider *provider, int fd)
 {
 	int i;
 	const char *opt_s;
-	bool no_ipv6 = false;
+	bool no_ipv6;
 
 	l2tp_write_option(fd, "nodetach", NULL);
 	l2tp_write_option(fd, "lock", NULL);
@@ -411,12 +411,6 @@ static int write_pppd_option(struct vpn_provider *provider, int fd)
 		if (!opt_s)
 			continue;
 
-		if (!g_strcmp0(opt_s, "PPPD.NoIPv6")) {
-			no_ipv6 = vpn_provider_get_boolean(provider,
-						pppd_options[i].cm_opt, false);
-			continue;
-		}
-
 		if (pppd_options[i].type == OPT_STRING)
 			l2tp_write_option(fd,
 				pppd_options[i].pppd_opt, opt_s);
@@ -432,6 +426,7 @@ static int write_pppd_option(struct vpn_provider *provider, int fd)
 	l2tp_write_option(fd, "plugin",
 				SCRIPTDIR "/libppp-plugin.so");
 
+	no_ipv6 = vpn_provider_get_boolean(provider, "PPPD.NoIPv6", false);
 	vpn_provider_set_supported_ip_networks(provider, true, !no_ipv6);
 
 	return 0;