Rework most of the OpenVPN support. The interfaces have been updated to

not use the pkg system and the configuration has been migrated to an
openvpn prefix. The centralized user and certificate manager is now used
to support the openvpn configurations. Most of the files removed in this
commit were not being referenced.

This commit also splits out the certificate management components into a
new system menu item.

3 files changed, 0 insertions, 733 deletions

diff --git a/usr/local/pkg/openvpn.xml b/usr/local/pkg/openvpn.xml
deleted file mode 100644
index 0a91a63..0000000
--- a/usr/local/pkg/openvpn.xml
+++ /dev/null
@@ -1,305 +0,0 @@
-<packagegui>
-	<name>openvpnserver</name>
-	<title>OpenVPN: Server</title>
-	<include_file>openvpn.inc</include_file>
-	<delete_string>An OpenVPN server has been deleted.</delete_string>
-	<addedit_string>An OpenVPN server has been created/modified.</addedit_string>
-	<tabs>
-		<tab>
-			<text>Server</text>
-			<url>/pkg.php?xml=openvpn.xml</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Client</text>
-			<url>/pkg.php?xml=openvpn_cli.xml</url>
-		</tab>
-		<tab>
-			<text>Client-specific overrides</text>
-			<url>/pkg.php?xml=openvpn_csc.xml</url>
-		</tab>
-		<tab>
-			<text>Certificate Authority</text>
-			<url>/vpn_openvpn_certs.php</url>
-		</tab>
-		<tab>
-			<text>Users</text>
-			<url>/vpn_openvpn_users.php</url>
-		</tab>
-	</tabs>
-	<adddeleteeditpagefields>
-		<columnitem>
-			<fieldname>disable</fieldname>
-			<fielddescr>Disabled</fielddescr>
-			<type>checkbox</type>
-		</columnitem>
-		<columnitem>
-			<fieldname>protocol</fieldname>
-			<fielddescr>Protocol</fielddescr>
-		</columnitem>
-		<columnitem>
-			<fieldname>addresspool</fieldname>
-			<fielddescr>Address pool</fielddescr>
-		</columnitem>
-		<columnitem>
-			<fieldname>description</fieldname>
-			<fielddescr>Description</fielddescr>
-		</columnitem>
-	</adddeleteeditpagefields>
-	<fields>
-		<field>
-			<fieldname>disable</fieldname>
-			<fielddescr>Disable this tunnel</fielddescr>
-			<description>This allows you to disable this tunnel without removing it from the list.</description>
-			<required/>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>protocol</fieldname>
-			<fielddescr>Protocol</fielddescr>
-			<description>The protocol to be used for the VPN.</description>
-			<required/>
-			<type>select</type>
-			<options>
-				<option>
-					<value>TCP</value>
-					<name>TCP</name>
-				</option>
-				<option>
-					<value>UDP</value>
-					<name>UDP</name>
-				</option>
-			</options>
-			<default_value>UDP</default_value>
-		</field>
-        <field>
-            <fieldname>bind_to_iface</fieldname>
-            <fielddescr>Bind to an interface</fielddescr>
-            <description>Check to bind on a specific network interface.</description>
-            <type>checkbox</type>
-            <enablefields>interface</enablefields>
-        </field>
-        <field>
-            <fieldname>interface</fieldname>
-            <fielddescr>Interface</fielddescr>
-            <description>The interface on which the OpenVPN daemon will listen.</description>
-            <type>interfaces_selection</type>
-            <default_value>wan</default_value>
-        </field>
-		<field>
-			<fieldname>dynamic_ip</fieldname>
-			<fielddescr>Dynamic IP</fielddescr>
-			<description>Assume dynamic IPs, so that DHCP clients can connect.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>local_port</fieldname>
-			<fielddescr>Local port</fielddescr>
-			<description>The port OpenVPN will listen on. You generally want 1194 here.</description>
-			<required/>
-			<type>input</type>
-			<default_value>1194</default_value>
-			<size>5</size>
-		</field>
-		<field>
-			<fieldname>addresspool</fieldname>
-			<fielddescr>Address pool</fielddescr>
-			<description>This is the address pool to be assigned to the clients. Expressed as a CIDR range (eg. 10.0.8.0/24). If the 'Use static IPs' field isn't set, clients will be assigned addresses from this pool. Otherwise, this will be used to set the local interface's IP.</description>
-			<required/>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>nopool</fieldname>
-			<fielddescr>Use static IPs</fielddescr>
-			<description>If this option is set, IPs won't be assigned to clients. Instead, the server will use static IPs on its side, and the clients are expected to use this same value in the 'Address pool' field.</description>
-			<required/>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>local_network</fieldname>
-			<fielddescr>Local network</fielddescr>
-			<description>This is the network that will be accessable from the remote endpoint. Expressed as a CIDR range. You may leave this blank if you don't want to add a route to the local network through this tunnel on the remote machine. This is generally set to your LAN network.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>remote_network</fieldname>
-			<fielddescr>Remote network</fielddescr>
-			<description>This is a network that will be routed through the tunnel, so that a site-to-site VPN can be established without manually changing the routing tables. Expressed as a CIDR range. If this is a site-to-site VPN, enter here the remote LAN here. You may leave this blank if you don't want a site-to-site VPN.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>client2client</fieldname>
-			<fielddescr>Client-to-client VPN</fielddescr>
-			<description>If this option is set, clients will be able to talk to each other. Otherwise, they will only be able to talk to the server.</description>
-			<required/>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>crypto</fieldname>
-			<fielddescr>Cryptography</fielddescr>
-			<description>Here you can choose the cryptography algorithm to be used.</description>
-			<required/>
-			<type>select</type>
-			<default_value>BF-CBC</default_value>
-		</field>
-		<field>
-			<fieldname>auth_method</fieldname>
-			<fielddescr>Authentication method</fielddescr>
-			<description>The authentication method to be used.</description>
-			<required/>
-			<type>select</type>
-			<options>
-				<option>
-					<value>shared_key</value>
-					<name>Shared key</name>
-				</option>	
-				<option>
-					<value>pki</value>
-					<name>PKI (Public Key Infrastructure)</name>
-				</option>
-			</options>
-			<onchange>onAuthMethodChanged()</onchange>
-		</field>
-		<field>
-                        <fieldname>cipher</fieldname>
-                        <fielddescr>Shared key</fielddescr>
-                        <description>Shared key to use.</description>
-                        <type>input</type>
-			<default_value></default_value>
-                </field>
-                <field>
-                        <fieldname>cipherpki</fieldname>
-                        <fielddescr>Certificate Authority</fielddescr>
-                        <description>CA associated with this server.</description>
-                        <type>select</type>
-                        <default_value>none</default_value>
-                </field>
-		<field>
-			<fieldname>dhcp_domainname</fieldname>
-			<fielddescr>DHCP Option: DNS Suffix</fielddescr>
-			<description>Set connection-specific DNS Suffix.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_dns</fieldname>
-			<fielddescr>DHCP Option: DNS Server</fielddescr>
-			<description>Set domain name server addresses, separated by semi-colons (;).</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_wins</fieldname>
-			<fielddescr>DHCP Option: WINS Server</fielddescr>
-			<description>Set WINS server addresses (NetBIOS over TCP/IP Name Server), separated by semi-colons (;).</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_nbdd</fieldname>
-			<fielddescr>DHCP Option: NBDD Server</fielddescr>
-			<description>Set NBDD server addresses (NetBIOS over TCP/IP Datagram Distribution Server), separated by semi-colons (;).</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_ntp</fieldname>
-			<fielddescr>DHCP Option: NTP Server</fielddescr>
-			<description>Set NTP server addresses (Network Time Protocol), separated by semi-colons (;).</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_nbttype</fieldname>
-			<fielddescr>DHCP Option: NetBIOS Node Type</fielddescr>
-			<description>Set NetBIOS over TCP/IP Node type. Possible options: b-node (broadcasts), p-node (point-to-point name queries to a WINS server), m-node (broadcast then query name server), and h-node (query name server, then broadcast).</description>
-			<type>select</type>
-			<options>
-				<option>
-					<value>0</value>
-					<name>none</name>
-				</option>
-				<option>
-				<value>1</value>
-					<name>b-node</name>
-				</option>
-				<option>
-					<value>2</value>
-					<name>p-node</name>
-				</option>
-				<option>
-					<value>4</value>
-					<name>m-node</name>
-				</option>
-				<option>
-					<value>8</value>
-					<name>h-node</name>
-				</option>
-			</options>
-			<default_value>0</default_value>
-		</field>
-		<field>
-			<fieldname>dhcp_nbtscope</fieldname>
-			<fielddescr>DHCP Option: NetBIOS Scope</fielddescr>
-			<description>Set NetBIOS over TCP/IP Scope. A NetBIOS Scope ID provides an extended naming service for NetBIOS over TCP/IP. The NetBIOS scope ID isolates NetBIOS traffic on a single network to only those nodes with the same NetBIOS scope ID.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_nbtdisable</fieldname>
-			<fielddescr>DHCP Option: Disable NetBIOS</fielddescr>
-			<description>If this option is set, Netbios-over-TCP/IP will be disabled.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>use_lzo</fieldname>
-			<fielddescr>LZO compression</fielddescr>
-			<description>Checking this will compress the packets using the LZO algorithm before sending them.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>maxclients</fieldname>
-			<fielddescr>Maximum clients</fielddescr>
-			<description>The maximum number of concurrently connected clients we want to allow.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>passtos</fieldname>
-			<fielddescr>Pass Type-Of-Service</fielddescr>
-			<description>Checking this will set the TOS field of the tunnel packet to what the payload's TOS is.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>gwredir</fieldname>
-			<fielddescr>Redirect Gateway</fielddescr>
-			<description>Redirect ALL traffic through the OpenVPN server.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>custom_options</fieldname>
-			<fielddescr>Custom options</fielddescr>
-			<description>You can put your own custom options here, separated by semi-colons (;). They'll be added to the server configuration.</description>
-			<type>textarea</type>
-			<cols>65</cols>
-			<rows>5</rows>
-		</field>
-		<field>
-			<fieldname>description</fieldname>
-			<fielddescr>Description</fielddescr>
-			<description>You may enter a description here. This is optional and is not parsed.</description>
-			<type>input</type>
-		</field>
-	</fields>
-	<custom_delete_php_command>
-		openvpn_delete('server', $id);
-	</custom_delete_php_command>
-	<custom_php_command_before_form>
-		openvpn_get_ciphers(&amp;$pkg);
-	</custom_php_command_before_form>
-	<custom_php_after_head_command>
-		openvpn_print_javascript('server');
-	</custom_php_after_head_command>
-	<custom_php_after_form_command>
-		openvpn_print_javascript2();
-	</custom_php_after_form_command>
-	<custom_php_validation_command>
-		openvpn_validate_input('server', $_POST, &amp;$input_errors);
-	</custom_php_validation_command>
-	<custom_php_resync_config_command>
-		openvpn_resync('server', $id);
-	</custom_php_resync_config_command>
-</packagegui>
diff --git a/usr/local/pkg/openvpn_cli.xml b/usr/local/pkg/openvpn_cli.xml
deleted file mode 100644
index 042b184..0000000
--- a/usr/local/pkg/openvpn_cli.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<packagegui>
-	<name>openvpnclient</name>
-	<title>OpenVPN: Client</title>
-	<include_file>openvpn.inc</include_file>
-	<delete_string>An OpenVPN client has been deleted.</delete_string>
-	<addedit_string>An OpenVPN client has been created/modified.</addedit_string>
-	<tabs>
-		<tab>
-			<text>Server</text>
-			<url>/pkg.php?xml=openvpn.xml</url>
-		</tab>
-		<tab>
-			<text>Client</text>
-			<url>/pkg.php?xml=openvpn_cli.xml</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Client-specific overrides</text>
-			<url>/pkg.php?xml=openvpn_csc.xml</url>
-		</tab>
-        <tab>
-			<text>Certificate Authority</text>
-			<url>/vpn_openvpn_certs.php</url>
-        </tab>
-        <tab>
-			<text>Users</text>
-			<url>/vpn_openvpn_users.php</url>
-        </tab>
-	</tabs>
-	<adddeleteeditpagefields>
-		<columnitem>
-			<fieldname>disable</fieldname>
-			<fielddescr>Disabled</fielddescr>
-			<type>checkbox</type>
-		</columnitem>
-		<columnitem>
-			<fieldname>serveraddr</fieldname>
-			<fielddescr>Server</fielddescr>
-		</columnitem>
-		<columnitem>
-			<fieldname>protocol</fieldname>
-			<fielddescr>Protocol</fielddescr>
-		</columnitem>
-		<columnitem>
-			<fieldname>description</fieldname>
-			<fielddescr>Description</fielddescr>
-		</columnitem>
-	</adddeleteeditpagefields>
-	<fields>
-		<field>
-			<fieldname>disable</fieldname>
-			<fielddescr>Disable this tunnel</fielddescr>
-			<description>This allows you to disable this tunnel without removing it from the list.</description>
-			<required/>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>protocol</fieldname>
-			<fielddescr>Protocol</fielddescr>
-			<description>The protocol to be used for the VPN.</description>
-			<required/>
-			<type>select</type>
-			<options>
-				<option>
-					<value>TCP</value>
-					<name>TCP</name>
-				</option>
-				<option>
-					<value>UDP</value>
-					<name>UDP</name>
-				</option>
-			</options>
-			<default_value>UDP</default_value>
-		</field>
-		<field>
-			<fieldname>serveraddr</fieldname>
-			<fielddescr>Server address</fielddescr>
-			<description>This is the address OpenVPN will try to connect to in order to establish the tunnel. Set it to the remote endpoint's address.</description>
-			<required/>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>serverport</fieldname>
-			<fielddescr>Server port</fielddescr>
-			<description>The port OpenVPN will use to connect to the server. Most people would want to use 1194 here.</description>
-			<required/>
-			<type>input</type>
-			<default_value>1194</default_value>
-			<size>5</size>
-		</field>
-		<field>
-			<fieldname>interface_ip</fieldname>
-			<fielddescr>Interface IP</fielddescr>
-			<description>This specifies the IPs to be assigned to the local interface. Expressed as a CIDR range. The first address in the range will be set to the remote endpoint of the interface, and the second will be assigned to the local endpoint. For TLS VPNs, the interface IPs are assigned by the server pool.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>remote_network</fieldname>
-			<fielddescr>Remote network</fielddescr>
-			<description>This is the network that will be accessable from your endpoint. Expressed as a CIDR range. You may leave this blank if all you want is to access the VPN clients. You normally want this set to the remote endpoint's LAN network.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>proxy_hostname</fieldname>
-			<fielddescr>Proxy Host</fielddescr>
-			<description>Proxy server hostname.</description>
-                        <type>input</type>
-		</field>
-		<field>
-			<fieldname>proxy_port</fieldname>
-			<fielddescr>Proxy port</fielddescr>
-			<description>The port OpenVPN will use on the proxy server.</description>
-			<type>input</type>
-			<default_value>3128</default_value>
-			<size>5</size>
-		</field>
-		<field>
-			<fieldname>crypto</fieldname>
-			<fielddescr>Cryptography</fielddescr>
-			<description>Here you can choose the cryptography algorithm to be used.</description>
-			<required/>
-			<type>select</type>
-			<default_value>BF-CBC</default_value>
-		</field>
-		<field>
-			<fieldname>auth_method</fieldname>
-			<fielddescr>Authentication method</fielddescr>
-			<description>The authentication method to be used.</description>
-			<required/>
-			<type>select</type>
-			<options>
-				<option>
-					<value>shared_key</value>
-					<name>Shared key</name>
-				</option>
-				<option>
-					<value>pki</value>
-					<name>PKI (Public Key Infrastructure)</name>
-				</option>
-			</options>
-			<onchange>onAuthMethodChanged()</onchange>
-		</field>
-		<field>
-			<fieldname>shared_key</fieldname>
-			<fielddescr>Shared key</fielddescr>
-			<description>Paste your shared key here.</description>
-			<type>textarea</type>
-			<encoding>base64</encoding>
-			<rows>8</rows>
-			<cols>40</cols>
-		</field>
-		<field>
-			<fieldname>ca.crt</fieldname>
-			<fielddescr>CA certificate</fielddescr>
-			<description>Paste the server's CA certificate in X.509 format here.</description>
-			<type>textarea</type>
-			<encoding>base64</encoding>
-			<rows>8</rows>
-			<cols>40</cols>
-		</field>
-		<field>
-			<fieldname>client.crt</fieldname>
-			<fielddescr>Client certificate</fielddescr>
-			<description>Paste your client certificate in X.509 format here.</description>
-			<type>textarea</type>
-			<encoding>base64</encoding>
-			<rows>8</rows>
-			<cols>40</cols>
-		</field>
-		<field>
-			<fieldname>client.key</fieldname>
-			<fielddescr>Client key</fielddescr>
-			<description>Paste your client key in RSA format here.</description>
-			<type>textarea</type>
-			<encoding>base64</encoding>
-			<rows>8</rows>
-			<cols>40</cols>
-		</field>
-		<field>
-			<fieldname>tls</fieldname>
-			<fielddescr>TLS</fielddescr>
-			<description>Paste your HMAC signature (TLS) here (optional).</description>
-			<type>textarea</type>
-			<encoding>base64</encoding>
-			<rows>8</rows>
-			<cols>40</cols>
-		</field>
-		<field>
-			<fieldname>use_lzo</fieldname>
-			<fielddescr>LZO compression</fielddescr>
-			<description>Checking this will compress the packets using the LZO algorithm before sending them.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>use_shaper</fieldname>
-			<fielddescr>Limit outgoing bandwidth</fielddescr>
-			<description>Maximum outgoing bandwidth for this tunnel. Leave empty for no limit. The input value has to be something between 100 bytes/sec and 100 Mbytes/sec (entered as bytes per second).</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>use_dynamicport</fieldname>
-			<fielddescr>Dynamic sourceport</fielddescr>
-			<description>Checking this will let the openvpn client choose a dynamic sourceport for this connection.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>passtos</fieldname>
-			<fielddescr>Pass Type-Of-Service</fielddescr>
-			<description>Checking this will set the TOS field of the tunnel packet to what the payload's TOS is.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>infiniteresolvretry</fieldname>
-			<fielddescr>Infinitely resolve server</fielddescr>
-			<description>Infinitely retry to resolve the host name of the OpenVPN server. Useful for not permanently internet-connected machines.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>custom_options</fieldname>
-			<fielddescr>Custom options</fielddescr>
-			<description>You can put your own custom options here, separated by semi-colons (;). They'll be added to the client configuration.</description>
-			<type>textarea</type>
-			<cols>65</cols>
-			<rows>5</rows>
-		</field>
-		<field>
-			<fieldname>description</fieldname>
-			<fielddescr>Description</fielddescr>
-			<description>You may enter a description here. This is optional and is not parsed.</description>
-			<type>input</type>
-		</field>
-	</fields>
-	<custom_delete_php_command>
-		openvpn_delete('client', $id);
-	</custom_delete_php_command>	
-	<custom_php_command_before_form>
-		openvpn_get_ciphers(&amp;$pkg);
-	</custom_php_command_before_form>
-	<custom_php_after_head_command>
-		openvpn_print_javascript('client');
-	</custom_php_after_head_command>
-	<custom_php_after_form_command>
-		openvpn_print_javascript2();
-	</custom_php_after_form_command>
-	<custom_php_validation_command>
-		openvpn_validate_input('client', $_POST, &amp;$input_errors);
-	</custom_php_validation_command>
-	<custom_php_resync_config_command>
-		openvpn_resync('client', $id);
-	</custom_php_resync_config_command>
-</packagegui>
diff --git a/usr/local/pkg/openvpn_csc.xml b/usr/local/pkg/openvpn_csc.xml
deleted file mode 100644
index 0e2f986..0000000
--- a/usr/local/pkg/openvpn_csc.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<packagegui>
-	<name>openvpncsc</name>
-	<title>OpenVPN: Client-specific configuration</title>
-	<include_file>openvpn.inc</include_file>
-	<delete_string>An OpenVPN client-specific configuration has been deleted.</delete_string>
-	<addedit_string>An OpenVPN client-specific configuration has been created/modified.</addedit_string>
-	<tabs>
-		<tab>
-			<text>Server</text>
-			<url>/pkg.php?xml=openvpn.xml</url>
-		</tab>
-		<tab>
-			<text>Client</text>
-			<url>/pkg.php?xml=openvpn_cli.xml</url>
-		</tab>
-		<tab>
-			<text>Client-specific overrides</text>
-			<url>/pkg.php?xml=openvpn_csc.xml</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Certificate Authority</text>
-			<url>/vpn_openvpn_certs.php</url>
-		</tab>
-		<tab>
-			<text>Users</text>
-			<url>/vpn_openvpn_users.php</url>
-		</tab>
-	</tabs>
-	<adddeleteeditpagefields>
-		<columnitem>
-			<fieldname>disable</fieldname>
-			<fielddescr>Disabled</fielddescr>
-			<type>checkbox</type>
-		</columnitem>
-		<columnitem>
-			<fieldname>commonname</fieldname>
-			<fielddescr>Common name</fielddescr>
-		</columnitem>
-		<columnitem>
-			<fieldname>description</fieldname>
-			<fielddescr>Description</fielddescr>
-		</columnitem>
-	</adddeleteeditpagefields>
-	<fields>
-		<field>
-			<fieldname>disable</fieldname>
-			<fielddescr>Disabled</fielddescr>
-			<description>Set this option to disable this client-specific configuration without removing it from the list.</description>
-			<required/>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>commonname</fieldname>
-			<fielddescr>Common name</fielddescr>
-			<description>Enter the client's X.509 common name here.</description>
-			<required/>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>block</fieldname>
-			<fielddescr>Blocked</fielddescr>
-			<description>Check this to block (disable) this client, based on its common name. Don't use this option to disable a client due to key or password compromise. Use a CRL (certificate revocation list) instead.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>push_reset</fieldname>
-			<fielddescr>Push reset</fielddescr>
-			<description>Setting this option will make this client not inherit the global push options.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>ifconfig_push</fieldname>
-			<fielddescr>Interface IP</fielddescr>
-			<description>Set this option to push an IP to the client's interface. Expressed as a CIDR range (e.g. 10.5.0.0/16). The first IP in the range will be used as the remote IP of the interface, and the second IP will be used as the local IP of the interface.</description>
-			<type>input</type>
-		</field>
-		
-		<field>
-			<fieldname>dhcp_domainname</fieldname>
-			<fielddescr>DHCP-Opt.: DNS-Domainname</fielddescr>
-			<description>Set connection-specific DNS Suffix.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_dns</fieldname>
-			<fielddescr>DHCP-Opt.: DNS-Server</fielddescr>
-			<description>Set domain name server addresses, separated by semi-colons (;).</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_wins</fieldname>
-			<fielddescr>DHCP-Opt.: WINS-Server</fielddescr>
-			<description>Set WINS server addresses (NetBIOS over TCP/IP Name Server), separated by semi-colons (;).</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_nbdd</fieldname>
-			<fielddescr>DHCP-Opt.: NBDD-Server</fielddescr>
-			<description>Set NBDD server addresses (NetBIOS over TCP/IP Datagram Distribution Server), separated by semi-colons (;).</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_ntp</fieldname>
-			<fielddescr>DHCP-Opt.: NTP-Server</fielddescr>
-			<description>Set NTP server addresses (Network Time Protocol), separated by semi-colons (;).</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_nbttype</fieldname>
-			<fielddescr>DHCP-Opt.: NetBIOS node type</fielddescr>
-			<description>Set NetBIOS over TCP/IP Node type. Possible options: b-node (broadcasts), p-node (point-to-point name queries to a WINS server), m-node (broadcast then query name server), and h-node (query name server, then broadcast).</description>
-			<type>select</type>
-			<options>
-				<option>
-					<value>0</value>
-					<name>none</name>
-				</option>
-				<option>
-				<value>1</value>
-					<name>b-node</name>
-				</option>
-				<option>
-					<value>2</value>
-					<name>p-node</name>
-				</option>
-				<option>
-					<value>4</value>
-					<name>m-node</name>
-				</option>
-				<option>
-					<value>8</value>
-					<name>h-node</name>
-				</option>
-			</options>
-			<default_value>0</default_value>
-		</field>
-		<field>
-			<fieldname>dhcp_nbtscope</fieldname>
-			<fielddescr>DHCP-Opt.: NetBIOS Scope</fielddescr>
-			<description>Set NetBIOS over TCP/IP Scope. A NetBIOS Scope ID provides an extended naming service for NetBIOS over TCP/IP. The NetBIOS scope ID isolates NetBIOS traffic on a single network to only those nodes with the same NetBIOS scope ID.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fieldname>dhcp_nbtdisable</fieldname>
-			<fielddescr>DHCP-Opt.: Disable NetBIOS</fielddescr>
-			<description>If this option is set, Netbios-over-TCP/IP will be disabled.</description>
-			<type>checkbox</type>
-		</field>
-    	<field>
-			<fieldname>gwredir</fieldname>
-			<fielddescr>Redirect Gateway</fielddescr>
-			<description>Redirect ALL traffic through the OpenVPN server.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fieldname>custom_options</fieldname>
-			<fielddescr>Custom options</fielddescr>
-			<description>You can put your own custom options here, separated by semi-colons (;). They'll be added to the client-specific configuration.</description>
-			<type>textarea</type>
-			<cols>65</cols>
-			<rows>5</rows>
-		</field>
-		<field>
-			<fieldname>description</fieldname>
-			<fielddescr>Description</fielddescr>
-			<description>You may enter a description here for your reference (not parsed).</description>
-			<type>input</type>
-		</field>
-	</fields>
-	<custom_php_validation_command>
-		openvpn_validate_input_csc($_POST, &amp;$input_errors);
-	</custom_php_validation_command>
-	<custom_php_resync_config_command>
-		openvpn_resync_csc($id);
-	</custom_php_resync_config_command>
-</packagegui>