From 822a8575e0a11bded4338675b96911945a763a26 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 25 Feb 2013 15:24:49 -0500
Subject: Better check for the right bits being set.

---
 etc/inc/openvpn.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 1894d64..973bf6f 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -1042,12 +1042,12 @@ function openvpn_clear_route($mode, $settings) {
 			break;
 		case 'p2p_tls':
 		case 'p2p_shared_key':
-			if (!empty($ip) && !empty($mask) && ($cidr == 30))
+			if ($cidr == 30)
 				$clear_route = true;
 			break;
 	}
 
-	if ($clear_route) {
+	if ($clear_route && !empty($ip) && !empty($mask)) {
 		list($ip1, $ip2) = openvpn_get_interface_ip($ip, $mask);
 		$ip_to_clear = ($mode == "server") ? $ip1 : $ip2;
 		mwexec("/sbin/route -q delete {$ip_to_clear}");
-- 
cgit v1.1