Extra blank OpenVPN Server added

phil.davis

2.1-BETA0 (i386)
built on Mon Sep 24 16:42:11 EDT 2012
FreeBSD 8.3-RELEASE-p4

and also updated to

2.1-BETA0 (i386)
built on Thu Sep 27 13:07:59 EDT 2012
FreeBSD 8.3-RELEASE-p4

When adding an OpenVPN server, an extra blank OpenVPN server row is also added straight above the new server entry.
On 24 Sep snapshot I can't delete it. Code is in the 27 Sep snapshot to let these get deleted from the GUI.
config.xml is like:


		 <openvpn-server><vpnid>2</vpnid>
			<mode>p2p_shared_key</mode>
			<protocol>UDP</protocol>
			<dev_mode>tun</dev_mode>
			<ipaddr></ipaddr>
			<interface>wan</interface>
			<local_port>4331</local_port>

			 <custom_options><shared_key>keyvaluewashere</shared_key>
			<crypto>AES-128-CBC</crypto>
			<engine>none</engine>
			<tunnel_network>10.50.1.0/24</tunnel_network>
			 <tunnel_networkv6><remote_network>10.51.1.0/24</remote_network>
			 <remote_networkv6><local_network>10.49.46.0/24</local_network>
			 <local_networkv6><maxclients>1</maxclients>

			<passtos></passtos>

			<dynamic_ip></dynamic_ip>
			<pool_enable>yes</pool_enable>

			<serverbridge_interface>none</serverbridge_interface>
			 <serverbridge_dhcp_start><serverbridge_dhcp_end><netbios_enable></netbios_enable>
			<netbios_ntype>0</netbios_ntype></serverbridge_dhcp_end></serverbridge_dhcp_start></local_networkv6></remote_networkv6></tunnel_networkv6></custom_options></openvpn-server>

A couple of lines were added to vpn_openvpn_server.php on 22 Sep 2012:

	if ($pconfig['dev_mode'] <> $a_server[$id]['dev_mode'])
openvpn_delete('server', $a_server[$id]);// delete(rename) interface so a new TUN or TAP interface can be created.

If I comment these out, the problem goes away. If I put them back, the problem comes back.

phil.davis

JimP has reverted the 22 Sep change for now. So the problem should go away in the next snapshot.