summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-08-16 15:34:28 -0400
committerjim-p <jimp@pfsense.org>2010-08-16 15:37:56 -0400
commita8abc4b308819351d08107659fe68ad0afa9cfc1 (patch)
treef8a666bcaeb88a9eef62485c2eee25312297d8b4
parent666d84c1478370f728e423aecfb42eadfb22bf36 (diff)
downloadpfsense-a8abc4b308819351d08107659fe68ad0afa9cfc1.zip
pfsense-a8abc4b308819351d08107659fe68ad0afa9cfc1.tar.gz
End processing when we receive an ERROR line. Part of ticket #826
-rw-r--r--etc/inc/openvpn.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index a529322..d23a6c3 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -747,7 +747,7 @@ function openvpn_get_active_servers() {
continue;
/* parse end of output line */
- if (strstr($line, "END"))
+ if (strstr($line, "END") || strstr($line, "ERROR"))
break;
/* parse client list line */
@@ -827,7 +827,7 @@ function openvpn_get_active_clients() {
$client['remote_host'] = $list[4];
}
/* parse end of output line */
- if (strstr($line, "END"))
+ if (strstr($line, "END") || strstr($line, "ERROR"))
break;
}
OpenPOWER on IntegriCloud