diff options
| author | jim-p <jimp@pfsense.org> | 2011-11-11 13:30:09 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-11-11 13:30:09 -0500 |
| commit | cfe9d9f9a0886175db93a3957ad1371df5ce6f56 (patch) | |
| tree | 0193f9ab8f47edec87e6c3b595737f10796f3c29 /config/openvpn_tapfix_20x | |
| parent | 856d4ce775e4ef1863b6c0e5106d86a2510553ea (diff) | |
| download | pfsense-packages-cfe9d9f9a0886175db93a3957ad1371df5ce6f56.tar.gz pfsense-packages-cfe9d9f9a0886175db93a3957ad1371df5ce6f56.tar.bz2 pfsense-packages-cfe9d9f9a0886175db93a3957ad1371df5ce6f56.zip | |
Fix some v4 bits that shouldn't have been there.
Diffstat (limited to 'config/openvpn_tapfix_20x')
| -rw-r--r-- | config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch b/config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch index d23d9290..b611f6f5 100644 --- a/config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch +++ b/config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch @@ -96,9 +96,9 @@ index 0ef67a7..bd9f527 100644 + if (($pconfig['serverbridge_dhcp_start'] && !$pconfig['serverbridge_dhcp_end']) + || (!$pconfig['serverbridge_dhcp_start'] && $pconfig['serverbridge_dhcp_end'])) + $input_errors[] = gettext("Server Bridge DHCP Start and End must both be empty, or defined."); -+ if (($pconfig['serverbridge_dhcp_start'] && !is_ipaddrv4($pconfig['serverbridge_dhcp_start']))) ++ if (($pconfig['serverbridge_dhcp_start'] && !is_ipaddr($pconfig['serverbridge_dhcp_start']))) + $input_errors[] = gettext("Server Bridge DHCP Start must be an IPv4 address."); -+ if (($pconfig['serverbridge_dhcp_end'] && !is_ipaddrv4($pconfig['serverbridge_dhcp_end']))) ++ if (($pconfig['serverbridge_dhcp_end'] && !is_ipaddr($pconfig['serverbridge_dhcp_end']))) + $input_errors[] = gettext("Server Bridge DHCP End must be an IPv4 address."); + if (ip2ulong($pconfig['serverbridge_dhcp_start']) > ip2ulong($pconfig['serverbridge_dhcp_end'])) + $input_errors[] = gettext("The Server Bridge DHCP range is invalid (start higher than end)."); @@ -198,7 +198,7 @@ index 0ef67a7..bd9f527 100644 </tr> <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Tunnel Network"); ?></td> -+ <td width="22%" valign="top" class="vncellreq" id="ipv4_tunnel_network"><?=gettext("IPv4 Tunnel Network"); ?></td> ++ <td width="22%" valign="top" class="vncellreq" id="ipv4_tunnel_network"><?=gettext("Tunnel Network"); ?></td> <td width="78%" class="vtable"> <input name="tunnel_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_network']);?>"> <br> |